diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp
index 82955d9..26ffdbb 100644
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -498,7 +498,6 @@ void DeviceManager::timerEvent(QTimerEvent* event)
 
 void DeviceManager::emitErrorCallback(const char *msg)
 {
-    mIsScanning = true;
     QString m(msg);
     emit raiseGlobalError( m);
 }
@@ -625,18 +624,26 @@ void DeviceManager::processAlarm(const QString& aAlarm)
 {
     QJsonObject jsonObj = toJsonObject(aAlarm);
     int alarmCode = jsonObj["code"].toInt();
-    QString alarm = jsonObj["info"].toString();
-    qDebug()<<"processAlarm "<<alarm;
-    switch(alarmCode)
+    QString alarm = QString::number(alarmCode);
+    qDebug()<<"processAlarm : "<<alarmCode;
+    if(alarmCode >= 400 && alarmCode < 500)
+    {
+        if(mIsScanning)
+        {
+            prepareFinishScan(false, alarm);
+        }
+        else
+        {
+            THROW_ERROR(alarm);
+        }
+    }
+    else if(alarmCode >= 500 && alarmCode < 600)
     {
-    case 1 :
-        prepareFinishScan(false, alarm);
-        break;
-    case 2 :
         emitInfoCallback(alarm, MessageLevel::Warning);
-        break;
-    default:
-        break;
+    }
+    else if(alarmCode >= 600 && alarmCode < 700)
+    {
+        emitInfoCallback(alarm, MessageLevel::Info);
     }
 }