diff --git a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
index d276691..28efb33 100644
--- a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
@@ -132,7 +132,7 @@
                 arpCache.update(targetIpAddress,
                         MACAddress.valueOf(value.getTargetMacAddress()));
             } catch (UnknownHostException e) {
-                log.error("Exception: ", e);
+                log.error("Unknown host", e);
             }
         }
 
@@ -143,7 +143,7 @@
             try {
                 arpCache.remove(InetAddress.getByAddress(value.getTargetAddress()));
             } catch (UnknownHostException e) {
-                log.error("Exception: ", e);
+                log.error("Unknown host", e);
             }
         }
 
@@ -158,7 +158,7 @@
                 arpCache.update(targetIpAddress,
                         MACAddress.valueOf(value.getTargetMacAddress()));
             } catch (UnknownHostException e) {
-                log.error("Exception: ", e);
+                log.error("Unknown host", e);
             }
         }
     }
@@ -393,7 +393,7 @@
             arpCacheEventChannel.addEntry(InetAddress.getByAddress(
                     arp.getSenderProtocolAddress()).toString(), arpCacheNotification);
         } catch (UnknownHostException e) {
-            log.error("Exception : ", e);
+            log.error("Unknown host", e);
         }
     }
 
