Minor improvements to error handling for dynamic app name change etc