diff --git a/app/elements/buddy-finder/device-name.html b/app/elements/buddy-finder/device-name.html
index 4f60536..e99620b 100644
--- a/app/elements/buddy-finder/device-name.html
+++ b/app/elements/buddy-finder/device-name.html
@@ -63,7 +63,11 @@
                     this._nameChanged(name);
                     return;
                 }
-                this._sendNameToServer(name);
+                try {
+                    this._sendNameToServer(name);
+                } catch (e) {
+                    this._nameChanged(name);
+                }
 
             }, 300);
 
diff --git a/app/elements/buddy-finder/personal-avatar.html b/app/elements/buddy-finder/personal-avatar.html
index 9941092..1b18018 100644
--- a/app/elements/buddy-finder/personal-avatar.html
+++ b/app/elements/buddy-finder/personal-avatar.html
@@ -20,6 +20,10 @@
         :host:hover device-name {
             color: #3367d6;
         }
+
+        :host:hover iron-icon {
+            transform: scale(1.05);
+        }
         
         iron-icon {
             width: 80px;