Add count to progress bar
Fail with real error message instead of hanging