MAP-459: fix NPE