diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index cd18bf4..ea7769a 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -714,9 +714,7 @@
 
       // If types don't agree due to opaque types, try to resolve them.
       if (DGV && DGV->getType() != SGA->getType())
-        if (RecursiveResolveTypes(SGA->getType(), DGV->getType()))
-          return Error(Err, "Alias Collision on '" + SGA->getName()+
-                       "': aliases have different types");
+        RecursiveResolveTypes(SGA->getType(), DGV->getType());
     }
 
     if (!DGV && !SGA->hasInternalLinkage()) {
@@ -724,9 +722,7 @@
 
       // If types don't agree due to opaque types, try to resolve them.
       if (DGV && DGV->getType() != SGA->getType())
-        if (RecursiveResolveTypes(SGA->getType(), DGV->getType()))
-          return Error(Err, "Alias Collision on '" + SGA->getName()+
-                       "': aliases have different types");
+        RecursiveResolveTypes(SGA->getType(), DGV->getType());
     }
 
     if (!DGV && !SGA->hasInternalLinkage()) {
@@ -734,9 +730,7 @@
 
       // If types don't agree due to opaque types, try to resolve them.
       if (DGV && DGV->getType() != SGA->getType())
-        if (RecursiveResolveTypes(SGA->getType(), DGV->getType()))
-          return Error(Err, "Alias Collision on '" + SGA->getName()+
-                       "': aliases have different types");
+        RecursiveResolveTypes(SGA->getType(), DGV->getType());
     }
 
     // No linking to be performed on internal stuff.
