[prep] Improve error messages
1 file changed