Merge change Ic86de6e9 into eclair

* changes:
  Fix NPE when opening new layout file.