Small parsing changes. Blow up on a non 200/201