Changed exception handling to a simple if

Probably faster this way, also more clear
Made the layout cleaner and more robust
Got rid of lying comment