Hotfix: Improved Errorhandling