Moved raise_if_options_incorrect to session.rb. Renamed errors.