Removed ObjectNotFoundException