diff --git a/device_support/basler/BASLERACA.cpp b/device_support/basler/BASLERACA.cpp
index f5dba51fa1..f52f0e82a1 100644
--- a/device_support/basler/BASLERACA.cpp
+++ b/device_support/basler/BASLERACA.cpp
@@ -877,7 +877,7 @@ int BASLER_ACA::startFramesAcquisition()
     Data *nodeData = t0Node->getData();
     timeStamp0 = (int64_t)nodeData->getLong();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
     sprintf(error, "%s: Error getting frame0 time\n", this->ipAddress);
   }
@@ -892,7 +892,7 @@ int BASLER_ACA::startFramesAcquisition()
       Data *nodeData = tStartOffset->getData();
       timeOffset = (float)nodeData->getFloatArray()[0];
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
       sprintf(error,
               "%s: Error getting timebaseNid (offset time set to 0.0s)\n",
diff --git a/device_support/basler/main.cpp b/device_support/basler/main.cpp
index a92732fb3b..0e2ba32506 100644
--- a/device_support/basler/main.cpp
+++ b/device_support/basler/main.cpp
@@ -48,9 +48,9 @@ int main(int argc, char **argv)
     node = tree->getNode((char *)"\\BASLER::TOP:BASLER:FRAME0_TIME");
     frame0TimeNid = node->getNid();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   // printf("frame node path: %s\n", node->getPath());
diff --git a/device_support/caen/caenInterface.cpp b/device_support/caen/caenInterface.cpp
index 265fbd108f..0be3da67c1 100644
--- a/device_support/caen/caenInterface.cpp
+++ b/device_support/caen/caenInterface.cpp
@@ -200,9 +200,9 @@ class SaveItem
       deleteData(endTime);
       deleteData(segCount);
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Cannot put segment: %s\n", exc->what());
+      printf("Cannot put segment: %s\n", exc.what());
     }
     delete dataNode;
     delete clockNode;
@@ -366,9 +366,9 @@ extern "C" void openTree(char *name, int shot, void **treePtr)
     Tree *tree = new Tree(name, shot);
     *treePtr = (void *)tree;
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("Cannot open tree %s %d: %s\n", name, shot, exc->what());
+    printf("Cannot open tree %s %d: %s\n", name, shot, exc.what());
   }
 }
 
diff --git a/device_support/camera_utils/cammdsutils.cpp b/device_support/camera_utils/cammdsutils.cpp
index 9c244761cf..4923ed9ffb 100644
--- a/device_support/camera_utils/cammdsutils.cpp
+++ b/device_support/camera_utils/cammdsutils.cpp
@@ -168,9 +168,9 @@ class SaveFrame
           metaNode->makeSegment(time, time, dim, (Array *)metaData);
         }
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR WRITING SEGMENT: " << exc->what() << "\n";
+        cout << "ERROR WRITING SEGMENT: " << exc.what() << "\n";
       }
       deleteData(data);
       deleteData(time);
@@ -196,9 +196,9 @@ class SaveFrame
       {
         dim = compileWithArgs("[$1]", (Tree *)treePtr, 1, time);
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR CompileWithArgs: " << exc->what() << "\n";
+        cout << "ERROR CompileWithArgs: " << exc.what() << "\n";
       }
 
       try
@@ -212,9 +212,9 @@ class SaveFrame
           metaNode->makeSegment(time, time, dim, (Array *)metaData);
         }
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR WRITING SEGMENT " << exc->what() << "\n";
+        cout << "ERROR WRITING SEGMENT " << exc.what() << "\n";
       }
 
       try
@@ -233,9 +233,9 @@ class SaveFrame
         else if (pixelSize <= 32)
           delete (int *)frame;
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        cout << "ERROR deleting data" << exc->what() << "\n";
+        cout << "ERROR deleting data" << exc.what() << "\n";
       }
     }
   }
@@ -426,9 +426,9 @@ int camOpenTree(char *treeName, int shot, void **treePtr)
     *treePtr = (void *)tree;
     return 0;
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    cout << "Error opening Tree " << treeName << ": " << exc->what() << "\n";
+    cout << "Error opening Tree " << treeName << ": " << exc.what() << "\n";
     return -1;
   }
 }
diff --git a/device_support/flir/FLIRSC65X.cpp b/device_support/flir/FLIRSC65X.cpp
index 1a79fa10d8..c590f4acfc 100644
--- a/device_support/flir/FLIRSC65X.cpp
+++ b/device_support/flir/FLIRSC65X.cpp
@@ -1972,7 +1972,7 @@ int FLIR_SC65X::startFramesAcquisition()
     Data *nodeData = t0Node->getData();
     timeStamp0 = (int64_t)nodeData->getLong();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
     printf("Error getting frame0 time\n");
   }
diff --git a/device_support/flir/main.cpp b/device_support/flir/main.cpp
index 3ca1b54a10..afcf11c73f 100644
--- a/device_support/flir/main.cpp
+++ b/device_support/flir/main.cpp
@@ -69,9 +69,9 @@ int main(int argc, char **argv)
         tree->getNode((char *)"\\CAMERATEST::TOP:POINTGRAY:FRAMES_METAD");
     dataNid = node->getNid(); // Node id to save the acquired frames
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   printf("frame node path: %s\n", node->getPath());
@@ -113,9 +113,9 @@ int main(int argc, char **argv)
     framePtr = (frameData)->getShortArray(dataDims);
     framePtrMeta = (frameDataMeta)->getByteArray(dataDimsMeta);
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   FLIR_SC65X *FlirCam;
diff --git a/device_support/national/AsyncStoreManager.cpp b/device_support/national/AsyncStoreManager.cpp
index bea55b51b4..d6b6efdf1a 100644
--- a/device_support/national/AsyncStoreManager.cpp
+++ b/device_support/national/AsyncStoreManager.cpp
@@ -126,7 +126,7 @@ void SaveItem::save()
         delete[] samples;
         delete[] times;
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         printf("Cannot convert stream sample: %s\n", exc.what());
       }
@@ -221,7 +221,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->beginSegment(startTime, endTime, dim, fData);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("BEGIN SEGMENT FAILED FOR NODE %s: %s\n",
                  dataNode->getFullPath(), exc.what());
@@ -245,7 +245,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->beginSegment(startTime, endTime, dim, fData);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("BEGIN SEGMENT FAILED FOR NODE %s: %s\n",
                  dataNode->getFullPath(), exc.what());
@@ -280,7 +280,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->putSegment(data, -1);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("PUT SEGMENT FAILED FOR NODE: %s: %s\n", dataNode->getFullPath(),
                  exc.what());
@@ -302,7 +302,7 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
           else
             dataNode->putSegment(data, -1);
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           printf("PUT SEGMENT FAILED FOR NODE: %s: %s\n", dataNode->getFullPath(),
                  exc.what());
@@ -317,9 +317,9 @@ std::cout << "CHIAMO LA FUN.." << std::endl;
       /* Send Event on Segment update <TreeName>_<DeviceNodeName>_CH<numchannel>*/
       // sendChannelSegmentPutEvent(dataNode);
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Cannot put segment: %s\n", exc->what());
+      printf("Cannot put segment: %s\n", exc.what());
     }
     delete clockNode;
   }
diff --git a/device_support/national/AsyncStoreManager.h b/device_support/national/AsyncStoreManager.h
index b6e103e489..82f76b7294 100644
--- a/device_support/national/AsyncStoreManager.h
+++ b/device_support/national/AsyncStoreManager.h
@@ -87,9 +87,9 @@ class SaveItem
               (tokens[1].substr(8)).data());
       Event::setevent(event);
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Send Event Error: %s\n", exc->what());
+      printf("Send Event Error: %s\n", exc.what());
     }
   }
 
diff --git a/device_support/national/NiInterface.cpp b/device_support/national/NiInterface.cpp
index befb01c816..c59e7d5e28 100644
--- a/device_support/national/NiInterface.cpp
+++ b/device_support/national/NiInterface.cpp
@@ -267,9 +267,9 @@ void openTree(char *name, int shot, void **treePtr)
     *treePtr = (void *)tree;
     TreeNode *n = tree->getNode("\\TOP");
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("Cannot open tree %s %d: %s\n", name, shot, exc->what());
+    printf("Cannot open tree %s %d: %s\n", name, shot, exc.what());
   }
 }
 
@@ -279,9 +279,9 @@ void closeTree(void *treePtr)
   {
     delete ((Tree *)treePtr);
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("Cannot close tree %s %d: %s\n", exc->what());
+    printf("Cannot close tree %s %d: %s\n", exc.what());
   }
 }
 
@@ -577,7 +577,7 @@ int xseriesReadAndSaveAllChannels(int aiFd, int nChan, void *chanFdPtr,
         Data *streamGainData = dataNode->getExtendedAttribute("STREAM_GAIN");
         streamGains[chan] = streamGainData->getFloat();
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamGains[chan] = 1;
       }
@@ -587,12 +587,12 @@ int xseriesReadAndSaveAllChannels(int aiFd, int nChan, void *chanFdPtr,
             dataNode->getExtendedAttribute("STREAM_OFFSET");
         streamOffsets[chan] = streamOffsetData->getFloat();
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamOffsets[chan] = 0;
       }
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       streamNames[chan] = NULL;
       streamGains[chan] = 0;
@@ -616,7 +616,7 @@ int xseriesReadAndSaveAllChannels(int aiFd, int nChan, void *chanFdPtr,
       coeffs[chanIdx] = rangeData->getFloatArray(&numCoeffs[chanIdx]);
       deleteData(rangeData);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("%s\n", exc.what());
     }
@@ -927,7 +927,7 @@ int pxi6259_readAndSaveAllChannels(
           Data *streamGainData = currNode->getExtendedAttribute("STREAM_GAIN");
           streamGains[i] = streamGainData->getFloat();
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           streamGains[i] = 1;
         }
@@ -937,12 +937,12 @@ int pxi6259_readAndSaveAllChannels(
               currNode->getExtendedAttribute("STREAM_OFFSET");
           streamOffsets[i] = streamOffsetData->getFloat();
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           streamOffsets[i] = 0;
         }
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamNames[i] = NULL;
         streamGains[i] = 0;
@@ -956,7 +956,7 @@ int pxi6259_readAndSaveAllChannels(
         delete currNode;
       }
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes\n");
     }
@@ -1719,9 +1719,9 @@ int temperatureProbeControl(uint32_t boardID, uint32_t *inChan, int numChan,
     errorNode = t->getNode((char *)"\\IPP_TC_TREND::ERROR");
     vRefNode = t->getNode((char *)"\\IPP_TC_TREND::VREF");
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("%s\n", exc->what());
+    printf("%s\n", exc.what());
     return -1;
   }
 
@@ -1866,9 +1866,9 @@ int temperatureProbeControl(uint32_t boardID, uint32_t *inChan, int numChan,
         currData = new Float32(vRef);
         vRefNode->putRow(currData, &currTime);
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        printf("%s\n", exc->what());
+        printf("%s\n", exc.what());
         error = 1;
         goto out;
       }
@@ -2723,7 +2723,7 @@ class SaveItemEV
         MDSplus::deleteData(endData);
         MDSplus::deleteData(dimData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in BeginSegment: " << exc.what() << std::endl;
       }
@@ -2738,7 +2738,7 @@ class SaveItemEV
         MDSplus::deleteData(dimData);
         MDSplus::deleteData(segData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in MakeSegment: " << exc.what() << std::endl;
       }
@@ -2752,7 +2752,7 @@ class SaveItemEV
         MDSplus::deleteData(endData);
         MDSplus::deleteData(dimData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in UpdateSegment: " << exc.what() << std::endl;
       }
@@ -2764,7 +2764,7 @@ class SaveItemEV
         node->putSegment(segData, -1);
         MDSplus::deleteData(segData);
       }
-      catch (MDSplus::MdsException &exc)
+      catch (const MDSplus::MdsException &exc)
       {
         std::cout << "Error in PutSegment: " << exc.what() << std::endl;
       }
@@ -3525,7 +3525,7 @@ int pxi6259EV_readAndSaveAllChannels(
       treeNodes[i] = new TreeNode(dataNid[i], (Tree *)treePtr);
       treeNodes[i]->deleteData();
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes\n");
     }
@@ -3669,7 +3669,7 @@ int pxi6368EV_readAndSaveAllChannels(
       treeNodes[i] = new TreeNode(dataNid[i], (Tree *)treePtr);
       treeNodes[i]->deleteData();
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes\n");
     }
@@ -3696,7 +3696,7 @@ int pxi6368EV_readAndSaveAllChannels(
       coeffs[chan] = rangeData->getFloatArray(&numCoeffs[chan]);
       deleteData(rangeData);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("%s\n", exc.what());
     }
diff --git a/device_support/national/cRioFAUfunction.cpp b/device_support/national/cRioFAUfunction.cpp
index 9893de2c30..db2dad9b77 100644
--- a/device_support/national/cRioFAUfunction.cpp
+++ b/device_support/national/cRioFAUfunction.cpp
@@ -100,9 +100,9 @@ class FAUSaveItem
       currSize);
       */
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
-      printf("Class FAUSaveItem: Error saving data  %s\n", exc->what());
+      printf("Class FAUSaveItem: Error saving data  %s\n", exc.what());
     }
   }
 };
@@ -597,9 +597,9 @@ int fauSaveAcqData(NiFpga_Session session, double tickPeriod, double trigTime,
       {
         currNode[i] = new TreeNode(dataNids[i], (Tree *)treePtr);
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        printf("Error collecting data nodes %s\n", exc->what());
+        printf("Error collecting data nodes %s\n", exc.what());
       }
     }
 
diff --git a/device_support/national/cRioMPAGfunction.cpp b/device_support/national/cRioMPAGfunction.cpp
index 38a73a5a33..8cc810b7e1 100644
--- a/device_support/national/cRioMPAGfunction.cpp
+++ b/device_support/national/cRioMPAGfunction.cpp
@@ -668,7 +668,7 @@ int mpag_readAndSaveAllChannels(NiFpga_Session session, int nChan, int *chanStat
           Data *streamGainData = currNode->getExtendedAttribute("STREAM_GAIN");
           streamGains[i] = streamGainData->getFloat();
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           streamGains[i] = 1;
         }
@@ -677,12 +677,12 @@ int mpag_readAndSaveAllChannels(NiFpga_Session session, int nChan, int *chanStat
           Data *streamOffsetData = currNode->getExtendedAttribute("STREAM_OFFSET");
           streamOffsets[i] = streamOffsetData->getFloat();
         }
-        catch (MdsException &exc)
+        catch (const MdsException &exc)
         {
           streamOffsets[i] = 0;
         }
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         streamNames[i] = NULL;
         streamGains[i] = 0;
@@ -696,7 +696,7 @@ int mpag_readAndSaveAllChannels(NiFpga_Session session, int nChan, int *chanStat
         delete currNode;
       }
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Error deleting data nodes %s : %s\n", currNode->getPath(), exc.what());
     }
diff --git a/device_support/national/probeTermControl.cpp b/device_support/national/probeTermControl.cpp
index 03525ce320..5d0e1ff550 100644
--- a/device_support/national/probeTermControl.cpp
+++ b/device_support/national/probeTermControl.cpp
@@ -325,9 +325,9 @@ int main(int argc, char **argv)
       node[i] = t->getNode(path);
     }
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
-    printf("%s\n", exc->what());
+    printf("%s\n", exc.what());
     exit(1);
   }
 
@@ -430,9 +430,9 @@ int main(int argc, char **argv)
           node[i]->putRow(currData, &currTime);
         }
       }
-      catch (MdsException *exc)
+      catch (const MdsException &exc)
       {
-        printf("%s\n", exc->what());
+        printf("%s\n", exc.what());
         error = 1;
         goto out;
       }
diff --git a/device_support/ptgrey/PTGREY.cpp b/device_support/ptgrey/PTGREY.cpp
index 3654b2b96a..1f8c35e0c2 100644
--- a/device_support/ptgrey/PTGREY.cpp
+++ b/device_support/ptgrey/PTGREY.cpp
@@ -1289,7 +1289,7 @@ int PTGREY::startFramesAcquisition()
     Data *nodeData = t0Node->getData();
     timeStamp0 = (int64_t)nodeData->getLong();
   }
-  catch (MdsException *exc)
+  catch (const MdsException &exc)
   {
     printf("Error getting frame0 time\n");
   }
@@ -1303,7 +1303,7 @@ int PTGREY::startFramesAcquisition()
       Data *nodeData = tStartOffset->getData();
       timeOffset = (float)nodeData->getFloatArray()[0];
     }
-    catch (MdsException *exc)
+    catch (const MdsException &exc)
     {
       printf("Error getting timebaseNid (offset time set to 0.0s)\n");
       timeOffset = 0.0;
diff --git a/device_support/ptgrey/main.cpp b/device_support/ptgrey/main.cpp
index cd2e0e11bf..c985bd0134 100644
--- a/device_support/ptgrey/main.cpp
+++ b/device_support/ptgrey/main.cpp
@@ -66,9 +66,9 @@ int main(int argc, char **argv)
     nodeMeta = tree->getNode((char *)"\\CAMERATEST::TOP:POINTGREY:FRAMES_METAD");
     dataNid = node->getNid(); //Node id to save the acquired frames
   }
-  catch (MDSplus::MdsException *exc)
+  catch (const MDSplus::MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   printf("frame node path: %s\n", node->getPath());
@@ -107,9 +107,9 @@ int main(int argc, char **argv)
     framePtr = (frameData)->getShortArray(dataDims);
     framePtrMeta = (frameDataMeta)->getByteArray(dataDimsMeta);
   }
-  catch (MdsException *exc)
+  catch (const MDSplus::MdsException &exc)
   {
-    std::cout << "ERROR reading data" << exc->what() << "\n";
+    std::cout << "ERROR reading data" << exc.what() << "\n";
   }
 
   PTGREY *PtgreyCam;
diff --git a/device_support/redpitaya/AsyncStoreManager.cpp b/device_support/redpitaya/AsyncStoreManager.cpp
index 8a9564b886..badd97906f 100644
--- a/device_support/redpitaya/AsyncStoreManager.cpp
+++ b/device_support/redpitaya/AsyncStoreManager.cpp
@@ -63,7 +63,7 @@ void SaveItem::save()
     std::cout << "MAKE SEGMENT  SAMPLES:" << segmentSamples << std::endl;
     dataNode->makeSegment(startSegData, endSegData, timebase, chanData);
   }
-  catch (MDSplus::MdsException &exc)
+  catch (const MDSplus::MdsException &exc)
   {
     std::cout << "Error writing segment: " << exc.what() << std::endl;
   }
diff --git a/device_support/redpitaya/redpitaya.cpp b/device_support/redpitaya/redpitaya.cpp
index 24fd5c24f6..b162d1eae5 100644
--- a/device_support/redpitaya/redpitaya.cpp
+++ b/device_support/redpitaya/redpitaya.cpp
@@ -730,7 +730,7 @@ void openTree(char *name, int shot, MDSplus::Tree **treePtr)
   {
     *treePtr = new MDSplus::Tree(name, shot);
   }
-  catch (MDSplus::MdsException &exc)
+  catch (const MDSplus::MdsException &exc)
   {
     *treePtr = 0;
   }
diff --git a/epics/cas/main.cc b/epics/cas/main.cc
index a57f5016f1..0d9de7dce5 100644
--- a/epics/cas/main.cc
+++ b/epics/cas/main.cc
@@ -26,9 +26,9 @@ extern int main(int argc, const char **argv)
 	    append = true;
 	else
 	    append = false; 
-    }catch(MdsException *exc)
+    }catch(const MdsException &exc)
     {
-	std::cout << "Cannot open experiment " << argv[1] << ": " << exc-> what() << "\n";
+	std::cout << "Cannot open experiment " << argv[1] << ": " << exc.what() << "\n";
 	return -1;
     }
     try {
diff --git a/epics/cas/mdsPV.cc b/epics/cas/mdsPV.cc
index 00e85f72ef..4bbae49013 100644
--- a/epics/cas/mdsPV.cc
+++ b/epics/cas/mdsPV.cc
@@ -250,9 +250,9 @@ mdsPV::mdsPV(mdsServer & casIn, char *name, Tree *treeIn, TreeNode *topNode, boo
 //		arr->getInfo(&clazz, &dtype, &length, &currDims, &dims, &ptr);
 //		nDims = currDims - 1;
 		deleteData(arr);
-	    }catch(MdsException *exc)
+	    }catch(const MdsException &exc)
 	    {
-		std::cout << "Error prevDef reading value for " << name << ": " << exc->what() << "\n";
+		std::cout << "Error prevDef reading value for " << name << ": " << exc.what() << "\n";
 		delete exc;
 	    }
 	}
@@ -263,9 +263,9 @@ mdsPV::mdsPV(mdsServer & casIn, char *name, Tree *treeIn, TreeNode *topNode, boo
 //		data->getInfo(&clazz, &dtype, &length, &currDims, &dims, &ptr);
 //		nDims = currDims;
 		deleteData(data);
-	    }catch(MdsException *exc)
+	    }catch(const MdsException &exc)
 	    {
-		std::cout << "Error reading value for " << name << ": " << exc->what() << "\n";
+		std::cout << "Error reading value for " << name << ": " << exc.what() << "\n";
 		delete exc;
 	    }
 	}
@@ -290,7 +290,7 @@ std::cout << "mdsPV  Data "<< currNode << "\n";
 //	    delete currNode;
 	    return;
 	}
-	catch(MdsException *exc)
+	catch(const MdsException &exc)
 	{
 	    nDims = 0;
 std::cout << "mdsPV  nDims exc"<< nDims <<"\n";
@@ -306,7 +306,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    hopr = currNode->getDouble();
 	    delete currNode;
 	    hasOpr = true;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 	    std::cout << "Cannot get LOPR or HOPR for " << name << "\n";
 	    hasOpr = false;
@@ -316,7 +316,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    currNode = tree->getNode(":UNITS");
 	    units = currNode->getString();
 	    delete currNode;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 	    std::cout << "Cannot get UNITS for " << name << "\n";
 	    units = NULL;
@@ -330,7 +330,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    lowAlarm = currNode->getDouble();
 	    delete currNode;
 	    hasAlarm = true;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 //	    std::cout << "Cannot get HIGH_ALARM or LOW_ALARM for " << name << "\n";
 	    hasAlarm = false;
@@ -344,7 +344,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    lowWarning = currNode->getDouble();
 	    delete currNode;
 	    hasWarning = true;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 //	    std::cout << "Cannot get HIGH_WARN or LOW_WARN for " << name << "\n";
 	    hasWarning = false;
@@ -358,7 +358,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    lowCtrl = currNode->getDouble();
 	    delete currNode;
 	    hasCtrl = true;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 //	    std::cout << "Cannot get HIGH_CTRL or LOW_CTRL for " << name << "\n";
 	    hasCtrl = false;
@@ -372,7 +372,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    lowGraphic = currNode->getDouble();
 	    delete currNode;
 	    hasGraphic = true;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 //	    std::cout << "Cannot get HIGH_GRAPH or LOW_GRAPH for " << name << "\n";
 	    hasGraphic = false;
@@ -382,7 +382,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    currNode = tree->getNode(":PREC");
 	    precision = currNode->getInt();
 	    delete currNode;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 //	    std::cout << "Cannot get PREC for " << name << "\n";
 	    precision = 0;
@@ -394,7 +394,7 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	    enums = enumData->getStringArray(&numEnums);
 	    deleteData(enumData);
 	    delete currNode;
-	} catch(MdsException *exc)
+	} catch(const MdsException &exc)
 	{
 	    enums = NULL;
 	    numEnums = 0;
@@ -403,9 +403,9 @@ std::cout << "mdsPV  nDims "<< nDims <<"\n";
 	tree->setDefault(prevDef);
 	delete prevDef;
         valid = true;
-   }catch(MdsException *exc)
+   }catch(const MdsException &exc)
     {
-	std::cout << "Error initilizing MDSplus nodes: " << exc->what() << "\n";
+	std::cout << "Error initilizing MDSplus nodes: " << exc.what() << "\n";
 	valid = false;
 	tree->setDefault(prevDef);
 	delete prevDef;
@@ -568,9 +568,9 @@ caStatus mdsPV::updateValue(const gdd & valueIn)
 	}
 	else
 	    valNode->putData(dataIn);
-    }catch(MdsException *exc)
+    }catch(const MdsException &exc)
     {
-	std::cout << "Error writing data: " << exc->what() << "\n";
+	std::cout << "Error writing data: " << exc.what() << "\n";
 	deleteData(dataIn);
 	return S_casApp_undefined;
     } 
@@ -910,7 +910,7 @@ Data *mdsPV::getData()
 	    deleteData(arr);
 	    delete [] dims;
 	    return retData;
-	}catch(MdsException *exc)
+	}catch(const MdsException &exc)
 	{
 	    return NULL;
 	    delete exc;
@@ -920,7 +920,7 @@ Data *mdsPV::getData()
     {
 	try {
 	    return valNode->getData();
-        }catch(MdsException *exc)
+        }catch(const MdsException &exc)
 	{
 	    return NULL;
 	    delete exc;
diff --git a/epics/cas/mdsServer.cc b/epics/cas/mdsServer.cc
index f5519feae2..8902802e6b 100644
--- a/epics/cas/mdsServer.cc
+++ b/epics/cas/mdsServer.cc
@@ -93,9 +93,9 @@ printf("TAG1: %s\n", pvName);
 	    delete [] tags[i];
 	}
 	delete [] tags;
-    }catch(MdsException *exc)
+    }catch(const MdsException &exc)
     {
-	std::cout << "Error reading tags: "<< exc->what() << "\n";
+	std::cout << "Error reading tags: "<< exc.what() << "\n";
     }
 }
 
@@ -137,10 +137,10 @@ mdsServer::mdsServer (Tree *tree, bool appendIn)
 		    deleteData(pvNameData);
 		    delete parentNode;
 		    delete valNode;
-		}catch(MdsException *exc)
+		}catch(const MdsException &exc)
 		{
 	
-		    std::cout << "Inconsistent node set found: " << fullPath << " " << exc->what() << "\n";
+		    std::cout << "Inconsistent node set found: " << fullPath << " " << exc.what() << "\n";
 		    //std::cout << "Inconsistent node set found: " << fullPath << " " <<  "\n";
 		}
 		delete [] fullPath;
@@ -148,9 +148,9 @@ mdsServer::mdsServer (Tree *tree, bool appendIn)
 	    delete [] currName;
 	}
 	delete stringNodes;
-     }catch(MdsException *exc)
+     }catch(const MdsException &exc)
     {
-	std::cout << "Error Scanning tree: "<< exc->what() << "\n";
+	std::cout << "Error Scanning tree: "<< exc.what() << "\n";
     }
  }
 
diff --git a/epics/mdsrecords/mdsplusSupUtilities.cpp b/epics/mdsrecords/mdsplusSupUtilities.cpp
index b2ea90f638..54f8ce73fc 100644
--- a/epics/mdsrecords/mdsplusSupUtilities.cpp
+++ b/epics/mdsrecords/mdsplusSupUtilities.cpp
@@ -207,7 +207,7 @@ static int getConnectionId(char *ipAddr, char *exp, int shot)
                        // required
         connectionTable[i].connection->openTree(exp, shot);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Cannot establish mdsip connection: %s\n", exc.what());
       connectionTable[i].connection = 0;
@@ -258,7 +258,7 @@ int openMds(char *expName, int shot, int isLocal, char *ipAddr, char *path,
       else
         node = 0;
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("Cannot Open tree or find node: %s\n", exc.what());
       strncpy(errMsg, exc.what(), 40);
@@ -431,7 +431,7 @@ int writeMds(int nodeId, double *vals, int dtype, int preTriggerSamples,
         node->putRow(data, (int64_t *)&epicsTime);
         deleteData(data);
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         strncpy(errMsg, exc.what(), 40);
         return 0;
@@ -453,7 +453,7 @@ int writeMds(int nodeId, double *vals, int dtype, int preTriggerSamples,
         deleteData(data);
         deleteData(timeData);
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         if (debug)
           printf("ERROR WRITING REMOTE TREE: %s\n", exc.what());
@@ -525,7 +525,7 @@ int writeMds(int nodeId, double *vals, int dtype, int preTriggerSamples,
         deleteData(times);
         deleteData(end);
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         strncpy(errMsg, exc.what(), 40);
         return 0;
@@ -556,7 +556,7 @@ int writeMds(int nodeId, double *vals, int dtype, int preTriggerSamples,
         deleteData(args[4]);
         deleteData(end);
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         if (debug)
           printf("ERROR WRITING REMOTE TREE: %s\n", exc.what());
@@ -844,7 +844,7 @@ int evaluateExpr(char *expr, int treeIdx, int nBuffers, void **buffers,
     for (i = 0; i < nBuffers; i++)
       deleteData(args[i]);
   }
-  catch (MdsException &exc)
+  catch (const MdsException &exc)
   {
     printf("ERROR WRITING REMOTE TREE: %s\n", exc.what());
     strncpy(errMsg, exc.what(), 40);
@@ -923,7 +923,7 @@ int doMdsAction(char *path, int nodeId, char *errMsg)
       // printf("Returned Data: %s\n", (resData)?resData->decompile():"");
       // if(resData) deleteData(resData);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("ERROR EXECUTING ACTION: %s\n", exc.what());
       strncpy(errMsg, exc.what(), 40);
@@ -939,7 +939,7 @@ int doMdsAction(char *path, int nodeId, char *errMsg)
       if (resData)
         deleteData(resData);
     }
-    catch (MdsException &exc)
+    catch (const MdsException &exc)
     {
       printf("ERROR EXECUTING REMOTE ACTION: %s\n", exc.what());
       strncpy(errMsg, exc.what(), 40);
diff --git a/include/mdsobjects.h b/include/mdsobjects.h
index f2a988ffc3..adf59489bf 100644
--- a/include/mdsobjects.h
+++ b/include/mdsobjects.h
@@ -104,7 +104,7 @@ namespace MDSplus
   {
 
     friend EXPORT std::ostream &operator<<(std::ostream &outStream,
-                                           MdsException &exc)
+                                           const MdsException &exc)
     {
       return outStream << exc.what();
     }
diff --git a/mdsobjects/cpp/testing/MdsExceptionTest.cpp b/mdsobjects/cpp/testing/MdsExceptionTest.cpp
index ef9840afc2..968488363b 100644
--- a/mdsobjects/cpp/testing/MdsExceptionTest.cpp
+++ b/mdsobjects/cpp/testing/MdsExceptionTest.cpp
@@ -40,7 +40,7 @@ int main()
   {
     throw_exception_msg();
   }
-  catch (mds::MdsException e)
+  catch (const mds::MdsException &e)
   {
     TEST1(std::string(e.what()) == "test message");
   }
@@ -49,7 +49,7 @@ int main()
   {
     throw_exception_status();
   }
-  catch (mds::MdsException e)
+  catch (const mds::MdsException &e)
   {
     TEST1(std::string(e.what()) == std::string(MdsGetMsg(5552368)));
   }
diff --git a/mdsobjects/cpp/testing/MdsTdiTest.cpp b/mdsobjects/cpp/testing/MdsTdiTest.cpp
index aca0790989..a0c791738b 100644
--- a/mdsobjects/cpp/testing/MdsTdiTest.cpp
+++ b/mdsobjects/cpp/testing/MdsTdiTest.cpp
@@ -94,7 +94,7 @@ int SingleThreadTest(int idx, int repeats)
         else if (STATUS_NOT_OK)
           throw MDSplus::MdsException(status);
       }
-      catch (MDSplus::MdsException e)
+      catch (const MDSplus::MdsException &e)
       {
         std::cerr << "ERROR in cycle " << ii << ":=" << status << " >> "
                   << cmds[ic] << "\n";
diff --git a/mdsobjects/labview/mdsdataobjectswrp.cpp b/mdsobjects/labview/mdsdataobjectswrp.cpp
index e681e60f45..d3d60f23fb 100644
--- a/mdsobjects/labview/mdsdataobjectswrp.cpp
+++ b/mdsobjects/labview/mdsdataobjectswrp.cpp
@@ -101,7 +101,7 @@ namespace MDSplus
       f();
       fillErrorCluster(errorCode, src, errorMessage, error);
     }
-    catch (MdsException const &e)
+    catch (const MdsException &e)
     {
       errorCode = bogusError;
       errorMessage = e.what();
@@ -6510,7 +6510,7 @@ namespace MDSplus
       {
         MDSplus::Tree *tree = new Tree("CACCA", -1);
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         std::cout << exc.what() << std::endl;
       }
@@ -6756,7 +6756,7 @@ namespace MDSplus
         Data *arrD = new Float32Array(floatArr, 10);
         n->makeSegment(start, end, dim, (Array *)arrD);
       }
-      catch (MdsException &exc)
+      catch (const MdsException &exc)
       {
         std::cout << "ERRORE: " << exc.what() << std::endl;
       }
diff --git a/mdsobjects/labview/mdseventobjectswrp.cpp b/mdsobjects/labview/mdseventobjectswrp.cpp
index 9c8817692f..837e89c4c9 100644
--- a/mdsobjects/labview/mdseventobjectswrp.cpp
+++ b/mdsobjects/labview/mdseventobjectswrp.cpp
@@ -74,7 +74,7 @@ EXPORT void mdsplus_event_abort(const void *lvEventPtr, ErrorCluster *error)
                 eventPtr = reinterpret_cast<Event *>(const_cast<void
 *>(lvEventPtr)); eventPtr->abort();
         }
-        catch (const MdsException & e)
+        catch (const MdsException &e)
         {
                 errorCode = bogusError;
                 errorMessage = e.what();