remove specific error, wrap more stuff in retry
Merge pull request #35 from maratoid/master

remove specific error, wrap more stuff in retry