MOB-2776 possible NPE fix