1 files changed, 6 insertions, 2 deletions
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index cbdd3e89aa..4d6a7ff6d7 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
@@ -430,11 +430,11 @@ public class ConnectorBundle {
     }
 
     private static boolean isClientRpc(JClassType type) {
-        return isType(type, ClientRpc.class);
+        return isInterfaceType(type, ClientRpc.class);
     }
 
     private static boolean isServerRpc(JClassType type) {
-        return isType(type, ServerRpc.class);
+        return isInterfaceType(type, ServerRpc.class);
     }
 
     public static boolean isConnectedConnector(JClassType type) {
@@ -451,6 +451,10 @@ public class ConnectorBundle {
         return isConnected(type) && isType(type, ComponentConnector.class);
     }
 
+    private static boolean isInterfaceType(JClassType type, Class<?> class1) {
+        return type.isInterface() != null && isType(type, class1);
+    }
+
     private static boolean isType(JClassType type, Class<?> class1) {
         try {
             return type.getOracle().getType(class1.getName())