[CAT-931] extended try-catch

extended try-catch to catch an Unexpected NullPointerException