Improving error cases.