Merge change I6dbcafab into eclair

* changes:
  Fix NPE in the parsing of property file.