NPE caught by labisso
extra null pointer testing, because can you really ever have too much
null testing? I dont think so, not when GCE is in play.

Also a little bit of lipstick...
try 2 at fixing the NPE labisso found
try #3
Merge pull request #122 from unwin/2014.05

NPE caught by labisso