Failed Handling: small fixes