diff --git a/pvAccessApp/remote/beaconEmitter.cpp b/pvAccessApp/remote/beaconEmitter.cpp
index 8b3c1e5..e967757 100644
--- a/pvAccessApp/remote/beaconEmitter.cpp
+++ b/pvAccessApp/remote/beaconEmitter.cpp
@@ -15,7 +15,7 @@ BeaconEmitter::BeaconEmitter(Transport* transport, ServerContext* context): _tra
 {
 	if(transport == NULL || context == NULL)
 	{
-		throw EpicsException("null transport or context");
+		THROW_BASE_EXCEPTION("null transport or context");
 	}
 
 /*	_timer = context->getTimer();
@@ -35,7 +35,7 @@ BeaconEmitter::BeaconEmitter(Transport* transport,const osiSockAddr* serverAddre
 {
 	if(transport == NULL)
 	{
-		throw EpicsException("null transport");
+		THROW_BASE_EXCEPTION("null transport");
 	}
 
 	_timer = new Timer("pvAccess-server timer", lowPriority);
diff --git a/pvAccessApp/remote/beaconServerStatusProvider.cpp b/pvAccessApp/remote/beaconServerStatusProvider.cpp
index dac0026..28fc9ed 100644
--- a/pvAccessApp/remote/beaconServerStatusProvider.cpp
+++ b/pvAccessApp/remote/beaconServerStatusProvider.cpp
@@ -10,7 +10,7 @@ BeaconServerStatusProvider::BeaconServerStatusProvider( ServerContext* context):
 {
 	if(context == NULL)
 	{
-		throw EpicsException("null context");
+		THROW_BASE_EXCEPTION("null context");
 	}
 	initialize();
 }
diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp
index bd190b0..0a57f87 100644
--- a/pvAccessApp/remote/blockingTCPTransport.cpp
+++ b/pvAccessApp/remote/blockingTCPTransport.cpp
@@ -654,10 +654,8 @@ namespace epics {
                     _sendBuffer->setPosition(currentPos);
                     _sendBuffer->setLimit(_sendBuffer->getSize());
                 }
-            } catch(BaseException* e) {
-                String trace;
-                e->toString(trace);
-                errlogSevPrintf(errlogMajor, "%s", trace.c_str());
+            } catch(std::exception& e) {
+                errlogSevPrintf(errlogMajor, "%s", e.what());
                 // error, release lock
                 clearAndReleaseBuffer();
             } catch(...) {
@@ -802,10 +800,8 @@ namespace epics {
                         else
                             endMessage(false);// automatic end (to set payload)
 
-                    } catch(BaseException* e) {
-                        String trace;
-                        e->toString(trace);
-                        errlogSevPrintf(errlogMajor, "%s", trace.c_str());
+                    } catch(std::exception &e) {
+                        errlogSevPrintf(errlogMajor, "%s", e.what());
                         _sendBuffer->setPosition(_lastMessageStartPosition);
                     } catch(...) {
                         _sendBuffer->setPosition(_lastMessageStartPosition);
diff --git a/pvAccessApp/utils/growingCircularBuffer.h b/pvAccessApp/utils/growingCircularBuffer.h
index 90e3598..cf58111 100644
--- a/pvAccessApp/utils/growingCircularBuffer.h
+++ b/pvAccessApp/utils/growingCircularBuffer.h
@@ -12,8 +12,6 @@
 
 #include <epicsException.h>
 
-using epics::pvData::BaseException;
-
 namespace epics {
     namespace pvAccess {
 
diff --git a/testApp/remote/testBlockingTCPClnt.cpp b/testApp/remote/testBlockingTCPClnt.cpp
index fbda28a..43226e1 100644
--- a/testApp/remote/testBlockingTCPClnt.cpp
+++ b/testApp/remote/testBlockingTCPClnt.cpp
@@ -151,11 +151,8 @@ void testBlockingTCPSender() {
                 break;
             sleep(1);
         }
-    } catch(BaseException* e) {
-        String info;
-        e->toString(info);
-        cout<<info<<endl;
-        delete e;
+    } catch(std::exception& e) {
+        cout<<e.what()<<endl;
     }
 
     delete transport;
diff --git a/testApp/remote/testRemoteClientImpl.cpp b/testApp/remote/testRemoteClientImpl.cpp
index 6b395b9..f0bbfd3 100644
--- a/testApp/remote/testRemoteClientImpl.cpp
+++ b/testApp/remote/testRemoteClientImpl.cpp
@@ -4064,7 +4064,6 @@ int main(int argc,char *argv[])
     channelGet->destroy();
     epicsThreadSleep ( 1.0 );
 
-
     ChannelPutRequesterImpl channelPutRequesterImpl;
     pvRequest = getCreateRequest()->createRequest("field(value,timeStamp)",&channelPutRequesterImpl);
     ChannelPut* channelPut = channel->createChannelPut(&channelPutRequesterImpl, pvRequest);
@@ -4131,7 +4130,7 @@ int main(int argc,char *argv[])
 
 
     monitor->destroy();
-    
+   
     epicsThreadSleep ( 3.0 );
     printf("Destroying channel... \n");
     channel->destroy();