fix a bug when errors happens without response
Merge branch 'mariojunior-fix-progress' into dev