MORE null checks.
Merge pull request #159 from Clashnia/characters

MORE null checks.