Catch unbinding errors

Test: none
Change-Id: Ia8ca50c7c55b86fac84a04a5e4ef2aa36ae6bf6e
Fixes: 72206319
(cherry picked from commit 7e9659fadc308cbe2f33d9915f3461bead791386)
1 file changed