possible fix for NPE in manage maps