fixed nullpointer error
Merge pull request #20 from nnordhof/master

fixed nullpointer error
Fixed java

I think
fixing stuff