Small refactor for demo errors.