Fixing citizen npc not being created, and NPE on player shop creation.