Some more changes to make error log more readable