Per @mlucy, standardize error message & implementation