diff --git a/crossechoTangoDev/Crossecho.py b/crossechoTangoDev/Crossecho.py
index 78c070655f66e25baa8510c38cc2f3d2b68f1449..72d2cf3ffe61c86500c0acc87953d643cf33937f 100644
--- a/crossechoTangoDev/Crossecho.py
+++ b/crossechoTangoDev/Crossecho.py
@@ -109,8 +109,9 @@ class Crossecho(Device):
 
     def delete_device(self):
         # PROTECTED REGION ID(Crossecho.delete_device) ENABLED START #
-        self.client.close_session()
-        self.client.close_secure_channel()
+        if self.client is not Null:
+            self.client.close_session()
+            self.client.close_secure_channel()
         # PROTECTED REGION END #    //  Crossecho.delete_device∑
 
     # ------------------