Clean up throwCritical() a bit.