Changed exception handling...everything will be now logged