Fix renaming; handle coroutine exceptions