Better error handling
1 file changed