Changed API to return server error if nothing found