Merge "Avoid NullPointerException on non-existing file."