Reworked Error Handling
Improved Errorhandling
Removed Error