Bugfixes catch more exceptions