Merge "Check for null path in getInternalPathForUser"