Removed unnecessary Exception checks