removed raise in controller