Fix error handling, also migrate to go1.3

I completely agree as long as it doesn't turn into too much work (which I don't think it will). @dfuentes and I were lamenting the complexity while debugging.