Fix error handling, also migrate to go1.3

Hmm no, though making that change locally for me makes the tests pass every time... they were also consistently failing for me before