Fixed failure handling.