936962 - test for throwing non-Errors, plus nits