Removed some null checks.
Merge pull request #11 from Maxiebyte/nullCheckRemove

Removed some null checks.
Merge pull request #13 from Maxiebyte/master

merge