[BUGFIX] Handle stop completion reason smoothly

Fixes #16