Merge change 24138 into eclair

* changes:
  Do not die when printing empty prefs.