From 42afcdf1157a77335559fe52d84b6b7c76552c79 Mon Sep 17 00:00:00 2001
From: Patrick Niklaus <patrick.niklaus@student.kit.edu>
Date: Wed, 2 Nov 2016 19:08:17 +0000
Subject: [PATCH] Another merged problem

---
 features/support/data_classes.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/support/data_classes.js b/features/support/data_classes.js
index a17141e5e..2ea8d4e09 100644
--- a/features/support/data_classes.js
+++ b/features/support/data_classes.js
@@ -107,6 +107,7 @@ module.exports = {
         }
 
         matchLocation (got, want) {
+            if (got == null || want == null) return false;
             return this.match(got[0], util.format('%d ~0.0025%', want.lon)) &&
                 this.match(got[1], util.format('%d ~0.0025%', want.lat));
         }