[CAT-930] added catch for NullPointerException