Bugfix: channel timeout tried to update wrong key in locker
and didn't check return value.