Very naive error handling - references #49