diff --git a/app/services/usage_report_builder.rb b/app/services/usage_report_builder.rb
index 6d4e39e071..5e5b2347cf 100644
--- a/app/services/usage_report_builder.rb
+++ b/app/services/usage_report_builder.rb
@@ -87,12 +87,8 @@ def call
     
     report
   rescue ActiveRecord::StatementInvalid => e
-    if e.message.match(/PG::UndefinedTable: ERROR:  relation "risk_assessments" does not exist/)
-      puts e.message
-      puts "=====================#{organization.short_name} is not properly setup. Skipping... ====================================="
-    else
-      raise e
-    end
+    puts e.message
+    puts "=====================#{organization.short_name} is not properly setup. Skipping... ====================================="
   end
   
   private