Corrected error cases