Feature/demo error handling