actually, need to do this in all of these functions

or else error messages don't have the right file and line