Fixed error-response issues