LOW / MODULES-88 prevent NPE