diff --git a/evcontroller.c b/evcontroller.c
index 1da38864..515a2258 100644
--- a/evcontroller.c
+++ b/evcontroller.c
@@ -1412,14 +1412,13 @@ int RemoveEVController(SConnection *pCon, char *name) {
      SCWrite(pCon,"ERROR: cannot delete while running",eError);
      return 0;
   }
-  EVUnregister(FindEMON(pServ->pSics),name);
-  iRet = RemoveCommand(pServ->pSics,name);
-  if(!iRet)
-  {
-    sprintf(pBueffel,"ERROR: %s not found, NOT deleted",name);
-    SCWrite(pCon,pBueffel,eError);
+  if (!FindCommandData(pServ->pSics, name, "Environment Controller")) {
+    SCPrintf(pCon,eError,"ERROR: no environment controller %s found",name);
     return 0;
   }
+  
+  EVUnregister(FindEMON(pServ->pSics),name);
+  RemoveCommand(pServ->pSics,name);
   return 1;
 }
 /*-------------------------------------------------------------------------