Merge "Catch unbinding errors" into oc-mr1-dev