#302 Made the handover future more robust for error handling