[CAT-932] added try-catch for NullPointer