Merge "Fix getters to return null on failure." into udc-dev