better error handling in case application config is insufficient
2 files changed