fixed exceptionhandling