diff --git a/validation/build_validation_databases.R b/validation/build_validation_databases.R
index 52471ae..997de32 100644
--- a/validation/build_validation_databases.R
+++ b/validation/build_validation_databases.R
@@ -49,11 +49,12 @@ if (length(data_dirs) > 0){
 
             db <- DBInterface$new()
             if (!file.exists(db_path_name)){
-                db$connect_to_new_database(db_path_name)
                 logging::loginfo(paste("Creating new database", db_path_name))
+                db$connect_to_new_database(db_path_name)
             } else {
-                db$connect_to_existing_database(db_path_name)
                 logging::loginfo(paste("Replacing existing database", db_path_name))
+                file.remove(db_path_name)
+                db$connect_to_new_database(db_path_name)
             }
 
             db$default_timeseries_column_aliases <- list(utc_tstamp='_ts', c_id='_c_id', voltage='_voltage', 
diff --git a/validation/full_validation.sh b/validation/full_validation.sh
index af4db93..0129191 100755
--- a/validation/full_validation.sh
+++ b/validation/full_validation.sh
@@ -1,3 +1,4 @@
+set -e
 # Execute validation scripts to compare two branches
 # Run from DER_disturbance_analysis base directory e.g.:
 # % ./validation/full_validation.sh branch_to_validate master