Improved exception handling. Don't swallow exception