diff --git a/lib/hive/base_error.rb b/lib/hive/base_error.rb
index 116f9af6e80e5a3b68ef6f1be48fadbc330d4d6c..caa2fcb94d7fa1579e61f6535c8e97c67d4954c3 100644
--- a/lib/hive/base_error.rb
+++ b/lib/hive/base_error.rb
@@ -142,7 +142,7 @@ module Hive
         raise Hive::TransactionIndexDisabledError, "#{context}: #{error.message}", build_backtrace(error)
       end
       
-      if error.message.include? 'is_valid_account_name'
+      if error.message.include?('Assert Exception:false: Account name ') && error.message.include?(' is not valid. Please follow the RFC 1035 rules.')
         raise Hive::InvalidAccountError, "#{context}: #{error.message}", build_backtrace(error)
       end