XD-1445: Rethrow unexpected exceptions in completion logic