Handle null for toString
Merge pull request #164 from codeservice/patch-7

Handle null for toString