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