Fix NullPointer exception
Merge branch 'master' of github.com:Runsafe/Framework