decouple error and tick
Merge pull request #15 from costford/master

decouple error and tick