Improving error condition