Merge "Check return from DeleteKey correctly." into oc-dev