Updates
Added error handling to parsing