Fix bad error handling dependencies on demo, date handling closes #26