added ... catch, due to argument change, so that legacy code doesn't
break