Fix not to return 500