KN-6999 Modified exception handling