move more die() calls to be _error() calls