Merge "Check for null filename before creating a new file."