Reduce duplication. Also improve error message
1 file changed