Removed exception requirement so we can use POSTMAN