I went back and forth on this, not particularly liking "return -1, err", but am fine changing it.