Added check for null argument #1
Merge pull request #9 from sindice/issue1

Added check for null argument #1