More null checks.
Merge pull request #158 from Clashnia/characters

More null checks.