Revert "Adding more exception handling"

This reverts commit 033ac509ca546e2143f9806b8937ba182d497ed5.