diff --git a/pom.xml b/pom.xml
index 8a8f07bc5e03d8bfed1fbb1a2e55cf89cb343666..e29a4e2a68b30942d0f388fd3d40b70f2d33ef21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.lib</groupId>
    <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
-   <version>2.5.21-SNAPSHOT</version>
+   <version>2.5.21</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index fe9ef40313f01a6088733d036f614b77aa892687..6ce103b016c3cba4912dbd6bd44a3f5bcb9bdae0 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -88,6 +88,9 @@ bool Novelec_MCCE2::init_protocol (void)
 
     switch(_MCCE2electroTypeNumber)
     {
+    case 0 : this->_MCCE2electroTypeStr = "Not connected";
+      success = false;
+        break;
     case 1 : this->_MCCE2electroTypeStr = "Photovolta�que UHS";
       _rangeLimit = 3;
       break;
@@ -105,9 +108,6 @@ bool Novelec_MCCE2::init_protocol (void)
 		break;
 	default :	set_electroState(FAULT);
                 success = false;
-		        Tango::Except::throw_exception ("COMMUNICATION_ERROR",
-			                                       "Invalid electrometerType returned!",
-			                                       "Novelec_MCCE2::init_protocol");
     }
   }
   catch(Tango::DevFailed& df)