diff --git a/debbuild/22.04/DEBIAN/postrm b/debbuild/22.04/DEBIAN/postrm
index 0d1573d..d3020a8 100644
--- a/debbuild/22.04/DEBIAN/postrm
+++ b/debbuild/22.04/DEBIAN/postrm
@@ -9,22 +9,23 @@ rm -rf ${X86Lib64Dir}/libwsutil.so.13
 rm -rf ${X86Lib64Dir}/libwsutil.so
 
 #rm -rf /usr/local/omc
-rm -rf /usr/local/etc/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 rm -f /usr/local/bin/omcd
 
-echo -n "Stopping OMC service ... "
-systemctl stop restagent.service
-systemctl stop crontask.service
-systemctl stop sshsvc.service
-systemctl stop captrace.service
-echo "done"
+systemctl daemon-reload
+
+if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
+    echo -n "Stopping OMC service ... "
+    systemctl stop restagent.service
+    systemctl stop crontask.service
+    systemctl stop sshsvc.service
+    systemctl stop captrace.service
+    echo "done"
+fi
 
-echo -n "Disable OMC service ... "
 systemctl disable restagent.service
 systemctl disable crontask.service
 systemctl disable sshsvc.service
 systemctl disable captrace.service
-echo "done"
 
-systemctl daemon-reload
\ No newline at end of file
+systemctl daemon-reload
diff --git a/debbuild/DEBIAN/postrm b/debbuild/DEBIAN/postrm
index 0d1573d..d3020a8 100644
--- a/debbuild/DEBIAN/postrm
+++ b/debbuild/DEBIAN/postrm
@@ -9,22 +9,23 @@ rm -rf ${X86Lib64Dir}/libwsutil.so.13
 rm -rf ${X86Lib64Dir}/libwsutil.so
 
 #rm -rf /usr/local/omc
-rm -rf /usr/local/etc/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 rm -f /usr/local/bin/omcd
 
-echo -n "Stopping OMC service ... "
-systemctl stop restagent.service
-systemctl stop crontask.service
-systemctl stop sshsvc.service
-systemctl stop captrace.service
-echo "done"
+systemctl daemon-reload
+
+if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
+    echo -n "Stopping OMC service ... "
+    systemctl stop restagent.service
+    systemctl stop crontask.service
+    systemctl stop sshsvc.service
+    systemctl stop captrace.service
+    echo "done"
+fi
 
-echo -n "Disable OMC service ... "
 systemctl disable restagent.service
 systemctl disable crontask.service
 systemctl disable sshsvc.service
 systemctl disable captrace.service
-echo "done"
 
-systemctl daemon-reload
\ No newline at end of file
+systemctl daemon-reload