X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=src%2Fplugins%2Fdovecot_mailstore.rb;h=0fffd97cbe378279dadf4d5c1ff988d4f63f8349;hp=40b201924514e032ee3349e1e1aa01aaa00adaa3;hb=cb6bcbecba8aa33c558a2d9217e284cbefe7513a;hpb=18ac3d44b843b0f28fa748146eec78da0561f195

diff --git a/src/plugins/dovecot_mailstore.rb b/src/plugins/dovecot_mailstore.rb
index 40b2019..0fffd97 100644
--- a/src/plugins/dovecot_mailstore.rb
+++ b/src/plugins/dovecot_mailstore.rb
@@ -16,7 +16,7 @@ class DovecotMailstore < Mailstore
       domain_path = get_domain_path(domain)
       return domain_path
     rescue NonexistentDomainError => e
-      return e.message
+      return "Doesn't Exist"
     end
   end
 
@@ -25,7 +25,7 @@ class DovecotMailstore < Mailstore
       account_path = get_account_path(account)
       return account_path
     rescue NonexistentAccountError => e
-      return e.message
+      return "Doesn't Exist"
     end
   end
 
@@ -94,7 +94,7 @@ class DovecotMailstore < Mailstore
     if File.directory?(domain_path)
       return domain_path
     else
-      raise NonexistentDomainError.new(domain_path)
+      raise NonexistentDomainError
     end
   end
 
@@ -110,13 +110,18 @@ class DovecotMailstore < Mailstore
     user_part = account_parts[0]
     domain_part = account_parts[1]
 
-    domain_path = get_domain_path(domain_part)
+    begin
+      domain_path = get_domain_path(domain_part)
+    rescue NonexistentDomainError
+      raise NonexistentAccountError
+    end
+
     account_path = File.join(domain_path, user_part)
 
     if File.directory?(account_path)
       return account_path
     else
-      raise NonexistentAccountError.new(account_path)
+      raise NonexistentAccountError
     end
   end