Add a little bit of error output
Add some cases for new responses