diff --git a/lib/sessions.rb b/lib/sessions.rb
index f2bfb4950..c8d0c6e31 100644
--- a/lib/sessions.rb
+++ b/lib/sessions.rb
@@ -423,9 +423,10 @@ returns
     }
     files.sort.each { |entry|
       filename = "#{path}/#{entry}"
-      if /^send/ =~ entry
-        data.push Sessions.queue_file_read(path, entry)
-      end
+      next if entry !~ /^send/
+      message = Sessions.queue_file_read(path, entry)
+      next if !message
+      data.push message
     }
     data
   end
@@ -434,12 +435,17 @@ returns
     file_old = "#{path}#{filename}"
     file_new = "#{path}a-#{filename}"
     FileUtils.mv(file_old, file_new)
-    all = ''
+    message = ''
     File.open(file_new, 'rb') { |file|
-      all = file.read
+      message = file.read
     }
     File.delete(file_new)
-    JSON.parse(all)
+    begin
+      return JSON.parse(message)
+    rescue => e
+      log('error', "can't parse queue message: #{message}, #{e.inspect}")
+      return
+    end
   end
 
   def self.cleanup
@@ -478,12 +484,13 @@ returns
       filename = "#{path}/#{entry}"
       next if !File.exist?(filename)
       File.open(filename, 'rb') { |file|
-        all   = file.read
-        spool = JSON.parse(all)
+        message = file.read
         begin
+          spool = JSON.parse(message)
           message_parsed = JSON.parse(spool['msg'])
         rescue => e
           log('error', "can't parse spool message: #{message}, #{e.inspect}")
+          to_delete.push "#{path}/#{entry}"
           next
         end