Revert "Revert "Handle non-existant ids in unbinds properly.""

This reverts commit c38fb84aa9d12ff61a18921b3cdfb463bbdabc98.