diff --git a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java
index 0f43db2..0a8918e 100644
--- a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java
+++ b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java
@@ -82,10 +82,7 @@
             log.error("linkDetected({}) failed", linkDescription, e);
             invalidate();
             Thread.currentThread().interrupt();
-        } catch (ExecutionException e) {
-            log.error("linkDetected({}) failed", linkDescription, e);
-            invalidate();
-        } catch (TimeoutException e) {
+        } catch (ExecutionException | TimeoutException e) {
             log.error("linkDetected({}) failed", linkDescription, e);
             invalidate();
         }
@@ -105,10 +102,7 @@
             log.error("linkVanished({}) failed", linkDescription, e);
             invalidate();
             Thread.currentThread().interrupt();
-        } catch (ExecutionException e) {
-            log.error("linkVanished({}) failed", linkDescription, e);
-            invalidate();
-        } catch (TimeoutException e) {
+        } catch (ExecutionException | TimeoutException e) {
             log.error("linkVanished({}) failed", linkDescription, e);
             invalidate();
         }
@@ -128,10 +122,7 @@
             log.error("linksVanished({}) failed", connectPoint, e);
             invalidate();
             Thread.currentThread().interrupt();
-        } catch (ExecutionException e) {
-            log.error("linksVanished({}) failed", connectPoint, e);
-            invalidate();
-        } catch (TimeoutException e) {
+        } catch (ExecutionException | TimeoutException e) {
             log.error("linksVanished({}) failed", connectPoint, e);
             invalidate();
         }
@@ -151,10 +142,7 @@
             log.error("linksVanished({}) failed", deviceId, e);
             invalidate();
             Thread.currentThread().interrupt();
-        } catch (ExecutionException e) {
-            log.error("linksVanished({}) failed", deviceId, e);
-            invalidate();
-        } catch (TimeoutException e) {
+        } catch (ExecutionException | TimeoutException e) {
             log.error("linksVanished({}) failed", deviceId, e);
             invalidate();
         }