Small changes to display error message, not yet displaying all info