Removed annoying Exceptions