diff --git a/src/ca/caProvider.cpp b/src/ca/caProvider.cpp
index 8f380b6..6ec6fb9 100644
--- a/src/ca/caProvider.cpp
+++ b/src/ca/caProvider.cpp
@@ -169,7 +169,11 @@ void CAChannelProvider::poll()
 
 void CAChannelProvider::attachContext()
 {
-    if(ca_current_context()) return;
+    ca_client_context* thread_context = ca_current_context();
+    if (thread_context == current_context) return;
+    if (thread_context != NULL) {
+        throw std::runtime_error("CAChannelProvider: Foreign CA context in use");
+    }
     int result = ca_attach_context(current_context);
     if (result != ECA_NORMAL) {
         std::cout <<
diff --git a/src/ca/caProviderPvt.h b/src/ca/caProviderPvt.h
index c5c8883..7f656b8 100644
--- a/src/ca/caProviderPvt.h
+++ b/src/ca/caProviderPvt.h
@@ -73,7 +73,7 @@ public:
     void attachContext();
 
 private:
-    virtual void destroy() EPICS_DEPRECATED {};
+    virtual void destroy() EPICS_DEPRECATED {}
     void initialize();
     ca_client_context* current_context;
     epics::pvData::Mutex channelListMutex;