* first step in improving error message for #874 * possible doc fix for #851 * improve comment * update changelog