Catch completion errors [Fixes #841]