forgot a check, and hiding some debug-spew