Error handler tweaks, closes #26