Bevans/requests

This already has the changes from j/84 branch merged in - was important to test those as well. Improves error handling as per #139.