Merge pull request #16 from The-Prp/mattbranch

Mattbranch
Removed null exception