Fixed NPE, removed map image for now.