That seems sensible enough, but it differs from what we do elsewhere in OpenStack, I think, where null checks are indeed added even though (I guess) the values "should never" be null.

@everett-toews: thoughts on this?