Not checking for null handler as this seems to be a bug preventing map drawing.