Fix for Lynch/onDeath, Support for Lynch+convertTo, Better Error handling