diff --git a/lib/xmet/raob.py b/lib/xmet/raob.py
index b28c7e7..8b26a8b 100644
--- a/lib/xmet/raob.py
+++ b/lib/xmet/raob.py
@@ -151,8 +151,11 @@ class RAOBObs():
         base_speed = 0
         base_dir   = 0
 
-        if token == '=':
-            return
+        if token == '=' or token == '//END':
+            return {
+                'dir':   None,
+                'speed': None
+            }
 
         if token[2] != '/':
             value = int(token[2])
@@ -326,7 +329,10 @@ class RAOBObs():
             if self.tokens[i][0:2] == '88':
                 break
 
-            samples.append(self.parse_ttaa_sample(self.tokens[i:i+3]))
+            data = self.parse_ttaa_sample(self.tokens[i:i+3])
+
+            if data is not None:
+                samples.append(data)
 
         return {
             'station':   station,