Merge "Fix NullPointerException around getObjectInfo."