updated exceptionhandling