Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev