improve storyboard error handling