@@ -22,8 +22,14 @@ module Security

         cipher.key = @@cipher_key = key

         cipher.iv  = @@cipher_iv = iv

-        decrypted = cipher.update(encrypted_message)

-        decrypted << cipher.final

+        begin

+            decrypted = cipher.update(encrypted_message)

+            decrypted << cipher.final

+        rescue

+            decrypted = ''

+        end

+

+        decrypted

     end

     def self.generate_token()