Removing redundant exception catching