More exceptions and bugfixes