Change return by a raise. Maybe a better error page can be show, but now it is helpful