Add more checks, add handling of console

1 file changed