diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
index c4a80ec2b03..9bb0028cdd9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/BundleContextImpl.java
@@ -868,7 +868,7 @@ Object setContextFinder() {
 			try {
 				currentThread.setContextClassLoader(container.getContextFinder());
 				return previousTCCL;
-			} catch (SecurityException e) {
+			} catch (RuntimeException e) {
 				// move on without setting TCCL (https://github.com/eclipse-equinox/equinox/issues/303)
 				
 				if (debug.DEBUG_GENERAL) {
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java
index ad4a5352a52..244cfe13051 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/XMLParsingServiceFactory.java
@@ -51,7 +51,7 @@ public Object getService(Bundle bundle, ServiceRegistration<Object> registration
 			if (cl != null) {
 				try {
 					Thread.currentThread().setContextClassLoader(cl);
-				} catch (SecurityException e) {
+				} catch (RuntimeException e) {
 					// move on without setting TCCL (https://github.com/eclipse-equinox/equinox/issues/303)
 					restoreTccl = false;
 				}