Merge "Add null check to getConfigForHostname" am: fe1eac7a19
am: 14cf68c284

* commit '14cf68c284fa611528c8f466c1fb41d5264cb0c2':
  Add null check to getConfigForHostname
  Work on issue #25467052: System lagged out