Removed TODO. Catch all exceptions