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...