Reverted die( to error(, mostly implemented #comments