diff --git a/src/runtime/error.rs b/src/runtime/error.rs
index d6621b4db3a53907076ed481ed8a74f085a88f1d..d2d42f160c290a934c13dad8e6181de94c24f920 100644
--- a/src/runtime/error.rs
+++ b/src/runtime/error.rs
@@ -1,20 +1,32 @@
 use crate::common::*;
 
-#[derive(Debug, Clone)]
-pub enum EndpointError {
-    MalformedMessage,
-    BrokenEndpoint,
+#[derive(Debug)]
+pub enum ConnectError {
+    BindFailed(SocketAddr),
+    PollInitFailed,
+    Timeout,
+    PollFailed,
+    AcceptFailed(SocketAddr),
+    AlreadyConnected,
+    PortPeerPolarityMismatch(PortId),
+    EndpointSetupError(SocketAddr, EndpointError),
+    SetupAlgMisbehavior,
 }
+////////////////////////
 #[derive(Debug, Clone)]
 pub enum SyncError {
-    Timeout,
     NotConnected,
     InconsistentProtoComponent(ProtoComponentId),
     IndistinguishableBatches([usize; 2]),
-    DistributedTimeout,
+    RoundFailure,
     PollFailed,
     BrokenEndpoint(usize),
 }
+#[derive(Debug, Clone)]
+pub enum EndpointError {
+    MalformedMessage,
+    BrokenEndpoint,
+}
 #[derive(Debug)]
 pub enum PortOpError {
     WrongPolarity,
@@ -28,19 +40,7 @@ pub enum GottenError {
     PortDidntGet,
     PreviousSyncFailed,
 }
-
 #[derive(Debug, Eq, PartialEq)]
 pub enum NextBatchError {
     NotConnected,
 }
-#[derive(Debug)]
-pub enum ConnectError {
-    BindFailed(SocketAddr),
-    PollInitFailed,
-    Timeout,
-    PollFailed,
-    AcceptFailed(SocketAddr),
-    AlreadyConnected,
-    PortPeerPolarityMismatch(PortId),
-    EndpointSetupError(SocketAddr, EndpointError),
-}