Fixed NPE in map controls