Merge "Catch unbinding errors" into pi-dev