Revert "catching error"

This reverts commit 11d3320dbe3c788af3e4bd1c1e172fc8120ca4a4.
Some more changes needed to be made.