diff --git a/OsmAnd/res/layout/osmo_connect_to_device.xml b/OsmAnd/res/layout/osmo_connect_to_device.xml
index 82eb6751ea..a202255d3a 100644
--- a/OsmAnd/res/layout/osmo_connect_to_device.xml
+++ b/OsmAnd/res/layout/osmo_connect_to_device.xml
@@ -60,7 +60,7 @@
             android:paddingLeft="3dp" />
     </TableRow>
     
-  <TableRow android:id="@+id/MyGroupName">
+  <TableRow android:id="@+id/MyGroupName" android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
index af6d9e7c50..150eb1e48e 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
@@ -240,7 +240,9 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	private List<OsMoDevice> mergeGroup(OsMoGroup gr, JSONObject obj, boolean deleteUsers) {
 		List<OsMoDevice> delta = new ArrayList<OsMoDevice>();
 		try {
-			parseGroup(obj.getJSONObject("group"), gr);
+			if(obj.has("group")) {
+				parseGroup(obj.getJSONObject("group"), gr);
+			}
 			JSONArray arr = obj.getJSONArray(USERS);
 			Map<String, OsMoDevice> toDelete = new HashMap<String, OsMoDevice>(gr.users);
 			for (int i = 0; i < arr.length(); i++) {