Continued work the Parser and added the Exception.