better error handling
2 files changed