Merge "Improved (or warned about lack of) error handling." into nyc-dev