[CAT-1089] added try catch for NullPointer