Added error handling to demo site