Fix for Comparator XML output not handling null values and file rename