diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index 277fdf3..935a9b7 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -90,6 +90,9 @@ def parse_ogn_receiver_beacon(aprs_comment):
 
 
 def parse_ogn_beacon(aprs_comment):
+    if not aprs_comment:
+        return {'beacon_type': 'receiver_beacon'}
+
     ac_data = parse_ogn_aircraft_beacon(aprs_comment)
     if ac_data:
         ac_data.update({'beacon_type': 'aircraft_beacon'})
diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index 2a8435c..30d6bde 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -17,10 +17,13 @@ class TestStringMethods(unittest.TestCase):
                     if aprs['comment']:
                         parse_ogn_beacon(aprs['comment'])
 
-    def test_fail_none(self):
+    def test_fail_parse_aprs_none(self):
         with self.assertRaises(TypeError):
             parse_aprs(None)
 
+    def test_parse_ogn_none(self):
+        parse_ogn_beacon(None)
+
     def test_fail_empty(self):
         with self.assertRaises(AprsParseError):
             parse_aprs("")