exceptionhandling fixed