diff --git a/lib/http_event_store/helpers/parse_entries.rb b/lib/http_event_store/helpers/parse_entries.rb
index aa6d80e..83b4156 100644
--- a/lib/http_event_store/helpers/parse_entries.rb
+++ b/lib/http_event_store/helpers/parse_entries.rb
@@ -13,17 +13,18 @@ def call(entries)
       private
 
       def create_event(entry)
-        return nil unless entry['data']
+        return nil unless entry['eventType']
 
         id               = entry['eventNumber']
         event_id         = entry['eventId']
         type             = entry['eventType']
         source_event_uri = entry['id']
-        data             = JSON.parse(entry['data'])
+        data             = entry['data'] ? JSON.parse(entry['data']) : nil
         stream_name      = entry['streamId']
         position         = entry['positionEventNumber']
         created_time     = entry['updated'] ? Time.parse(entry['updated']) : nil
 
+
         Event.new(type, data, source_event_uri, event_id, id, position, stream_name, created_time)
       end
     end