Better errors - closes #455