fix: avoid invoking onCompletion handler twice for non-service errors

fix: avoid invoking onCompletion handler twice for non-service errors #123