Removed extra exceptions