More robust properties file handling