Adjust error message as per @ralphbean advices