diff --git a/support/tools/MoM/convert_split_and_rename_mom_database_sqldump.py b/support/tools/MoM/convert_split_and_rename_mom_database_sqldump.py
index 04cb1fd2a270dba10f2cd03959f9d183cef8012c..a86bca03c02a7c786436163aaf8a279c34d07a0e 100755
--- a/support/tools/MoM/convert_split_and_rename_mom_database_sqldump.py
+++ b/support/tools/MoM/convert_split_and_rename_mom_database_sqldump.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-
+import os
 # This script reads infile and creates sql files for each part in the infile in the
 # outdir directory. It also replaces references to the indatabase with references
 # to the outdatabase.
@@ -26,7 +26,11 @@ outIDMdatabase = "lofar_mom_test_rt_trigger_idm"
 inUserAdmindatabase = "useradministration"
 outUserAdmindatabase = "lofar_mom_test_rt_trigger_useradmin"
 
-outfile = open(outdir +"000000_CREATE_DATABASE.sql", 'w')
+if os.listdir(outdir) != []:
+    print "Output directory not empty! Aborting"
+    exit()
+
+outfile = open(outdir + "000000_CREATE_DATABASE.sql", 'w')
 
 # Please note that "Comments" in the SQL that look like this
 # /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -82,6 +86,7 @@ outfile = open(outdir +"000000_CREATE_DATABASE.sql", 'w')
 # - Generated views for the BiRT viewer (starting with /*!50001 VIEW )
 # - Comments
 # - USE statements
+# - Foreign keys
 # We only check for these and not all lines of the SQL, as this saves having to parse the
 # WRITE statements that are 99% of the SQL and by far the longest lines.
 
@@ -94,7 +99,8 @@ possible_trigger = False
 trigger = False
 with open(infile) as f:
     for line in f:
-        if not use_found or trigger or (line[0:13] == "/*!50001 VIEW") or (line[0:2] == '--'):
+        if not use_found or trigger or (line[0:13] == "/*!50001 VIEW") or (line[0:2] == '--') or \
+           "CONSTRAINT" in line[0:len("CONSTRAINT") + 2]:
             # "/*!50001 VIEW" are special BiRT viewer generated views
             if indatabase in line: #doing this for each line would be expensive
                 line = line.replace(indatabase, outdatabase)