Fixed an issue where the parser was returning an Exception when it shouldn't have been. Removed some unneccesary null checks.