diff --git a/ogn/aprs_parser.py b/ogn/aprs_parser.py
index 8ebd7a7..c06ed0e 100644
--- a/ogn/aprs_parser.py
+++ b/ogn/aprs_parser.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 
 from .model import Beacon, AircraftBeacon, ReceiverBeacon
-from ogn.exceptions import AprsParseError
+from ogn.parser.exceptions import AprsParseError
 
 
 def parse_aprs(packet, reference_date=None):
diff --git a/ogn/gateway/client.py b/ogn/gateway/client.py
index 248b0ba..1f0b826 100644
--- a/ogn/gateway/client.py
+++ b/ogn/gateway/client.py
@@ -4,7 +4,7 @@ from time import time
 
 from ogn.gateway import settings
 from ogn.aprs_parser import parse_aprs
-from ogn.exceptions import AprsParseError, OgnParseError, AmbigousTimeError
+from ogn.parser.exceptions import AprsParseError, OgnParseError, AmbigousTimeError
 
 
 def create_aprs_login(user_name, pass_code, app_name, app_version, aprs_filter=None):
diff --git a/ogn/model/aircraft_beacon.py b/ogn/model/aircraft_beacon.py
index 8f4754b..6b60d47 100644
--- a/ogn/model/aircraft_beacon.py
+++ b/ogn/model/aircraft_beacon.py
@@ -4,7 +4,7 @@ from sqlalchemy import Column, String, Integer, Float, Boolean, SmallInteger
 
 from ogn.parser.utils import fpm2ms
 from .beacon import Beacon
-from ogn.exceptions import OgnParseError
+from ogn.parser.exceptions import OgnParseError
 
 
 class AircraftBeacon(Beacon):
diff --git a/ogn/model/beacon.py b/ogn/model/beacon.py
index 2818b34..470982d 100644
--- a/ogn/model/beacon.py
+++ b/ogn/model/beacon.py
@@ -5,7 +5,7 @@ from sqlalchemy import Column, String, Integer, Float, DateTime
 from sqlalchemy.ext.declarative import AbstractConcreteBase
 
 from ogn.parser.utils import createTimestamp, dmsToDeg, kts2kmh, feet2m
-from ogn.exceptions import AprsParseError
+from ogn.parser.exceptions import AprsParseError
 from .base import Base
 
 
diff --git a/ogn/model/receiver_beacon.py b/ogn/model/receiver_beacon.py
index d566d51..feab3e5 100644
--- a/ogn/model/receiver_beacon.py
+++ b/ogn/model/receiver_beacon.py
@@ -3,7 +3,7 @@ import re
 from sqlalchemy import Column, Float, String
 
 from .beacon import Beacon
-from ogn.exceptions import OgnParseError
+from ogn.parser.exceptions import OgnParseError
 
 
 class ReceiverBeacon(Beacon):
diff --git a/ogn/parser/__init__.py b/ogn/parser/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ogn/exceptions.py b/ogn/parser/exceptions.py
similarity index 71%
rename from ogn/exceptions.py
rename to ogn/parser/exceptions.py
index fcbb6c1..387069e 100644
--- a/ogn/exceptions.py
+++ b/ogn/parser/exceptions.py
@@ -9,17 +9,16 @@ class AprsParseError(Exception):
     def __init__(self, aprs_string):
         self.aprs_string = aprs_string
 
-        self.message = "This is not a valid APRS string: {}".format(aprs_string)
+        self.message = "This is not a valid APRS packet: {}".format(aprs_string)
         super(AprsParseError, self).__init__(self.message)
 
 
 class OgnParseError(Exception):
-    """Parse error while parsing an aprs packet substring."""
-    def __init__(self, substring, expected_type):
-        self.substring = substring
-        self.expected_type = expected_type
+    """Parse error while parsing an ogn message from aprs comment."""
+    def __init__(self, aprs_comment):
+        self.aprs_comment = aprs_comment
 
-        self.message = "For type {} this is not a valid token: {}".format(expected_type, substring)
+        self.message = "This is not a valid OGN message: {}".format(aprs_comment)
         super(OgnParseError, self).__init__(self.message)
 
 
diff --git a/tests/model/test_aircraft_beacon.py b/tests/model/test_aircraft_beacon.py
index d9580ab..2809756 100644
--- a/tests/model/test_aircraft_beacon.py
+++ b/tests/model/test_aircraft_beacon.py
@@ -4,7 +4,7 @@ from datetime import datetime
 
 from ogn.parser.utils import ms2fpm
 from ogn.model import Beacon, AircraftBeacon
-from ogn.exceptions import OgnParseError
+from ogn.parser.exceptions import OgnParseError
 
 
 class TestStringMethods(unittest.TestCase):
diff --git a/tests/model/test_beacon.py b/tests/model/test_beacon.py
index a142b90..d0e84ca 100644
--- a/tests/model/test_beacon.py
+++ b/tests/model/test_beacon.py
@@ -4,7 +4,7 @@ from datetime import datetime
 
 from ogn.parser.utils import dmsToDeg, kts2kmh, m2feet
 from ogn.model import Beacon
-from ogn.exceptions import AprsParseError
+from ogn.parser.exceptions import AprsParseError
 
 
 class TestStringMethods(unittest.TestCase):
diff --git a/tests/model/test_receiver_beacon.py b/tests/model/test_receiver_beacon.py
index 1f8bdaa..9ca573a 100644
--- a/tests/model/test_receiver_beacon.py
+++ b/tests/model/test_receiver_beacon.py
@@ -1,7 +1,7 @@
 import unittest
 
 from ogn.model import ReceiverBeacon
-from ogn.exceptions import OgnParseError
+from ogn.parser.exceptions import OgnParseError
 
 
 class TestStringMethods(unittest.TestCase):
diff --git a/tests/test_aprs_parser.py b/tests/test_aprs_parser.py
index 1056576..62c09e0 100644
--- a/tests/test_aprs_parser.py
+++ b/tests/test_aprs_parser.py
@@ -5,7 +5,7 @@ from datetime import datetime
 from time import sleep
 
 from ogn.aprs_parser import parse_aprs
-from ogn.exceptions import AprsParseError, OgnParseError
+from ogn.parser.exceptions import AprsParseError, OgnParseError
 
 
 class TestStringMethods(unittest.TestCase):