Merge pull request #14 from stuntguy3000/master

Add NPE Checks