diff --git a/MAVProxy/modules/mavproxy_wp.py b/MAVProxy/modules/mavproxy_wp.py
index cc1be0cc8e..9b6fee3e0c 100644
--- a/MAVProxy/modules/mavproxy_wp.py
+++ b/MAVProxy/modules/mavproxy_wp.py
@@ -241,7 +241,7 @@ def get_WP0(self, home_only=False):
         this ideally should be home, but if home is not available then use a click position
         '''
         (lat, lon, alt) = (None, None, None)
-        if 'HOME_POSITION' in self.master.messages:
+        if self.master is not None and 'HOME_POSITION' in self.master.messages:
             h = self.master.messages['HOME_POSITION']
             (lat, lon, alt) = (h.latitude*1.0e-7, h.longitude*1.0e-7, h.altitude*1.0e-3)
         elif home_only: