FORGE-1968: Fixed ExceptionFuture awareness