diff --git a/app/vmanager/routes.py b/app/vmanager/routes.py
index cd7f898..fe30a56 100644
--- a/app/vmanager/routes.py
+++ b/app/vmanager/routes.py
@@ -184,9 +184,11 @@ def remove(unit_id=0):
             try:
                 #pubvlans depends on deploy as foreign key so delete them first
                 for pubvlan in deploy.inv_pubvlans:
-                    pubvlan.pubaddr.pubvlan_id = None
-                    pubvlan.pubaddr.user_id = None
-                    db.session.commit()
+                    #clean public addr assignment
+                    if pubvlan.pubaddr != None:
+                        pubvlan.pubaddr.pubvlan_id = None
+                        pubvlan.pubaddr.user_id = None
+                        db.session.commit()
                     db.session.delete(pubvlan)
                     db.session.commit()