Revert "Added null checks to SWGMap"

This reverts commit 0f3cb757eb81768d8719004dd2851d4bd99022f1.