Fix two additional issues where we needed to croak() on fatal errors