fix #230 Machine Demo - Error Handling