diff --git a/connect/eaas/core/proto.py b/connect/eaas/core/proto.py
index de8c2f2..20b652e 100644
--- a/connect/eaas/core/proto.py
+++ b/connect/eaas/core/proto.py
@@ -305,6 +305,8 @@ def deserialize(cls, raw):
         raw_data = raw.get('data')
 
         if version == 2:
+            if 'output' in raw_data and 'runtime' in raw_data['output']:
+                raw['data']['output']['runtime'] = raw_data['output']['runtime'] or 0.0
             return cls(**raw)
 
         if message_type == MessageType.CAPABILITIES:
@@ -368,7 +370,7 @@ def deserialize(cls, raw):
                         result=raw_data['result'],
                         data=raw_data.get('data'),
                         countdown=raw_data['countdown'],
-                        runtime=raw_data.get('runtime'),
+                        runtime=raw_data.get('runtime', 0.0),
                         message=raw_data.get('output'),
                     ),
                 ),