Fix crashes
Merge pull request #4 from PEMapModder/patch-2

Fix crashes