diff --git a/lib/rgc/arg_parser.rb b/lib/rgc/arg_parser.rb
index <HASH>..<HASH> 100644
--- a/lib/rgc/arg_parser.rb
+++ b/lib/rgc/arg_parser.rb
@@ -25,8 +25,7 @@ module Rgc
       on_error do |exception|
         # Error logic here
         # return false to skip default error handling
-        puts exception.backtrace
-        true
+        false
       end
 
       init_keygen
diff --git a/lib/rgc/smudge.rb b/lib/rgc/smudge.rb
index <HASH>..<HASH> 100644
--- a/lib/rgc/smudge.rb
+++ b/lib/rgc/smudge.rb
@@ -13,7 +13,11 @@ module Rgc
       @aes.decrypt
       @aes.key = @key
 
-      STDOUT.print(@aes.update(Base64.decode64(content)) + @aes.final)
+      begin
+        STDOUT.print(@aes.update(Base64.decode64(content)) + @aes.final)
+      rescue
+        abort "File not encrypted"
+      end
     end
   end
 end
Smudge should abort when file not encrypted