diff --git a/eservice/pdo/eservice/scripts/EServiceCLI.py b/eservice/pdo/eservice/scripts/EServiceCLI.py
index 4e9052f5..bdc37dde 100644
--- a/eservice/pdo/eservice/scripts/EServiceCLI.py
+++ b/eservice/pdo/eservice/scripts/EServiceCLI.py
@@ -44,6 +44,7 @@
 from twisted.internet import reactor, defer
 from twisted.internet.endpoints import TCP4ServerEndpoint
 from twisted.web.wsgi import WSGIResource
+from twisted.internet.error import ReactorNotRunning
 
 ## ----------------------------------------------------------------
 def ErrorResponse(request, error_code, msg) :
diff --git a/pservice/pdo/pservice/scripts/PServiceCLI.py b/pservice/pdo/pservice/scripts/PServiceCLI.py
index a3cf84f3..3e97e7ea 100644
--- a/pservice/pdo/pservice/scripts/PServiceCLI.py
+++ b/pservice/pdo/pservice/scripts/PServiceCLI.py
@@ -35,7 +35,6 @@
 import pdo.common.utility as putils
 
 import pdo.pservice.pdo_helper as pdo_enclave_helper
-import pdo.pservice.pdo_enclave as pdo_enclave
 
 import logging
 logger = logging.getLogger(__name__)
@@ -46,9 +45,7 @@
 from twisted.web import server, resource, http
 from twisted.internet import reactor, defer
 from twisted.web.error import Error
-
-import base64
-
+from twisted.internet.error import ReactorNotRunning
 
 ## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ## XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -180,7 +177,8 @@ def _secretreq(self, minfo) :
             logger.debug("Expected public key: %s", opk)
             assert contract_info['pdo_contract_creator_pem_key'] == opk
         except :
-            logger.error('request to create secret did not come from the contract owner; %s != %s', contracttxn.OriginatorID, opk)
+            logger.error('request to create secret did not come from the contract owner; %s != %s',
+                         contract_info['pdo_contract_creator_pem_key'], opk)
             raise Error(http.NOT_ALLOWED, 'operation not allowed for {0}'.format(opk))
 
         # make sure the provisioning service is allowed to access contract by the checking the list of allowed provisioning services
diff --git a/sservice/pdo/sservice/scripts/SServiceCLI.py b/sservice/pdo/sservice/scripts/SServiceCLI.py
index cb57275d..a1caae74 100644
--- a/sservice/pdo/sservice/scripts/SServiceCLI.py
+++ b/sservice/pdo/sservice/scripts/SServiceCLI.py
@@ -45,6 +45,7 @@
 from twisted.internet import reactor, defer, task
 from twisted.internet.endpoints import TCP4ServerEndpoint
 from twisted.web.wsgi import WSGIResource
+from twisted.internet.error import ReactorNotRunning
 
 ## ----------------------------------------------------------------
 def ErrorResponse(request, error_code, msg) :