Fixed error where the directory and filename settings were not being written back to the main properties object in all cases.