Improved handling of properties file in cases where it doesn't exist