Minor modifications to make error display a little better.