1 files changed, 12 insertions, 0 deletions
diff --git a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 524182f66c..289fd25594 100644
--- a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
@@ -218,6 +218,18 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper {
             // Shortcut for performance
             return true;
         }
+        
+        if (source == null || target == null){
+            return false;
+        }
+        
+        if (source.getInterface() == target.getInterface()){
+            return true;
+        }
+        
+        if (source.getInterface() == null || target.getInterface() == null){
+            return false;
+        }
 
         if (source.getInterface().isDynamic() || target.getInterface().isDynamic()) {
             return true;