Prevent a NPE in intializer

wait for descriptor to be loaded so initializer can get it.
Merge commit '367a66639d331138fce3007bf5af006114421c0f' into HEAD