2 files changed, 13 insertions, 8 deletions
diff --git a/database-versioning/libeufin-bank-drop.sql b/database-versioning/libeufin-bank-drop.sql
index 52ef772b..2b120b24 100644
--- a/database-versioning/libeufin-bank-drop.sql
+++ b/database-versioning/libeufin-bank-drop.sql
@@ -5,12 +5,14 @@ $do$
 DECLARE
     patch text;
 BEGIN
-    for patch in SELECT patch_name FROM _v.patches WHERE patch_name LIKE 'libeufin_bank_%' loop 
-        PERFORM _v.unregister_patch(patch);
-    end loop;
+    IF EXISTS(SELECT 1 FROM information_schema.schemata WHERE schema_name='_v') THEN
+        FOR patch IN SELECT patch_name FROM _v.patches WHERE patch_name LIKE 'libeufin_bank_%' LOOP 
+            PERFORM _v.unregister_patch(patch);
+        END LOOP;
+    END IF;
 END
 $do$;
 
-DROP SCHEMA libeufin_bank CASCADE;
+DROP SCHEMA IF EXISTS libeufin_bank CASCADE;
 
 COMMIT;
diff --git a/database-versioning/libeufin-nexus-drop.sql b/database-versioning/libeufin-nexus-drop.sql
index 199f1cb9..4eed7f3c 100644
--- a/database-versioning/libeufin-nexus-drop.sql
+++ b/database-versioning/libeufin-nexus-drop.sql
@@ -5,11 +5,14 @@ $do$
 DECLARE
     patch text;
 BEGIN
-    for patch in SELECT patch_name FROM _v.patches WHERE patch_name LIKE 'libeufin_nexus_%' loop 
-        PERFORM _v.unregister_patch(patch);
-    end loop;
+    IF EXISTS(SELECT 1 FROM information_schema.schemata WHERE schema_name='_v') THEN
+        FOR patch IN SELECT patch_name FROM _v.patches WHERE patch_name LIKE 'libeufin_nexus_%' LOOP 
+            PERFORM _v.unregister_patch(patch);
+        END LOOP;
+    END IF;
 END
 $do$;
-DROP SCHEMA libeufin_nexus CASCADE;
+
+DROP SCHEMA IF EXISTS libeufin_nexus CASCADE;
 
 COMMIT;