Merge "PatchPanel: Avoid null pointer dereferences." into nyc-dev
am: 4e42d3ea2c

* commit '4e42d3ea2c33a2f6556299d9c54824ba32236bd0':
  PatchPanel: Avoid null pointer dereferences.