Fix death, logging and assert