Tweaks until error-handling config include can be included in an app
Added missing "Trait" in trait name