NullReferenceException bugfix for null arguments
optimization
Merge pull request #100 from postromantic/master

NullReferenceException bugfix for null arguments