Exceptionhandling fixed