Fixed warning about null-conversion.
Merge pull request #17 from danepowell/feature/null-warning

Fixed warning about null-conversion.