Check for nullness before using object, otherwise you have potential uncaught nullpointer exceptions.
I'm really not even sure if its possible for these values to be null, but since the checks are there I'm
making sure they're done right.
Merge branch 'master' of https://github.com/l1j/en