Bugfix, Error Handling