Removed extra catch code that is redundant