Adding extra error cases