NullReferenceException avoided
Merge pull request #1 from zulman/patch-1

NullReferenceException avoided