Removed unnecessary exceptions