Fix Crash on Initial Map Load

This should fix the crash reported in #31. @rnc505 can you confirm?