Updated exceptions list, raise generic exceptions