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

* commit 'a207fca4eda8c17389ea13ec3762ecb2a49d81be':
  Improved (or warned about lack of) error handling.