Improved error handling, and hopefully improved the situation in #43
Fixing /cycle, closes #45