Added custom death handler