diff --git a/proto/server_car/connect.proto b/proto/server_car/connect.proto
index f6d74881f30..4922fccca9e 100644
--- a/proto/server_car/connect.proto
+++ b/proto/server_car/connect.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package carkot;
+import "error.proto";
 
 option java_package = "proto.car";
 option java_outer_classname = "ConnectP";
@@ -10,5 +11,8 @@ message ConnectionRequest {
 }
 
 message ConnectionResponse {
-    string uid = 1;
+    oneof response {
+        Error error = 2;
+        int32 uid = 1;
+    }
 }
diff --git a/proto/server_car/error.proto b/proto/server_car/error.proto
new file mode 100644
index 00000000000..6e4e1a4f6f4
--- /dev/null
+++ b/proto/server_car/error.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+package carkot;
+
+option java_package = "proto.car";
+option java_outer_classname = "ErrorP";
+
+message Error {
+    string errorMessage = 1;
+    int32 errorCode = 2;
+}
diff --git a/proto/server_car/location.proto b/proto/server_car/location.proto
index f833375525c..d5fb710d109 100644
--- a/proto/server_car/location.proto
+++ b/proto/server_car/location.proto
@@ -1,11 +1,18 @@
 syntax = "proto3";
 package carkot;
+import "error.proto";
 
 option java_package = "proto.car";
 option java_outer_classname = "LocationP";
 
 message Location {
-    double x = 1;
-    double y = 2;
-    double angle = 3;
+    oneof response {
+        Error error = 2;
+        LocationResponse locationResponse = 1;
+    }
+    message LocationResponse {
+        double x = 1;
+        double y = 2;
+        double angle = 3;
+    }
 }
diff --git a/proto/server_car/routeDone.proto b/proto/server_car/routeDone.proto
index 59e6c77e534..d10194ec2ea 100644
--- a/proto/server_car/routeDone.proto
+++ b/proto/server_car/routeDone.proto
@@ -5,5 +5,5 @@ option java_package = "proto.car";
 option java_outer_classname = "RouteDoneP";
 
 message RouteDone {
-    string uid = 1;
+    int32 uid = 1;
 }