re-adding a couple of cases missed during the merge, giving up on forwared exceptions

forwarding exception is "the right way" but I was getting a
basic_string exception that I couldn't track down. Doesn't move the
needle for a batch program, but would have been nice for the local
backend.