Fix NPE being thrown due to null parameters
Merge pull request #8 from skyrimfan1/master

NullPointerException