The fancy error checking was not working and just breaking things so it'...

...s out