Merge "Stop metadata retriever from dereferencing a NULL pointer if"