diff --git a/org.eclipse.osbp.xtext.oxtype/src/org/eclipse/osbp/xtext/oxtype/linking/OXTypeLinkingService.java b/org.eclipse.osbp.xtext.oxtype/src/org/eclipse/osbp/xtext/oxtype/linking/OXTypeLinkingService.java
index 8cb5e88..8740a59 100644
--- a/org.eclipse.osbp.xtext.oxtype/src/org/eclipse/osbp/xtext/oxtype/linking/OXTypeLinkingService.java
+++ b/org.eclipse.osbp.xtext.oxtype/src/org/eclipse/osbp/xtext/oxtype/linking/OXTypeLinkingService.java
@@ -96,9 +96,13 @@
 			EObject context, EReference eReference) {
 		if (scopeProvider instanceof OXDelegatingNamespaceScopeProvider) {
 			// this scope provider just delegates between JvmTypes and EObjects
-			OXDelegatingNamespaceScopeProvider provider = (OXDelegatingNamespaceScopeProvider) scopeProvider;
-			ImportedNamesAdapter adapter = getImportedNamesAdapter(context);
-			provider.setWrapper(adapter, eReference);
+			try {
+				OXDelegatingNamespaceScopeProvider provider = (OXDelegatingNamespaceScopeProvider) scopeProvider;
+				ImportedNamesAdapter adapter = getImportedNamesAdapter(context);
+				provider.setWrapper(adapter, eReference);
+			} catch (Exception e) {
+				LOGGER.error("{}", e);
+			}
 		} else if (scopeProvider instanceof AbstractGlobalScopeDelegatingScopeProvider) {
 			AbstractGlobalScopeDelegatingScopeProvider provider = (AbstractGlobalScopeDelegatingScopeProvider) scopeProvider;
 			ImportedNamesAdapter adapter = getImportedNamesAdapter(context);
