Merge change 23595 into eclair

* changes:
  fixing NPE that i see on my Mac when running idegen.sh