LOW / Prevent NPE (possible cause for MODULES-135)