added back some error feedback