Bugfixes for some exceptions.