Added error parsing (messy)