Fixing issues in fallback
Fixing issues in fallback

Incrementing correct value (whoops!)
Refactoring promise chain so we're doubly sure that we're actually
erroring.

medic/medic-analytics,medic/medic-analytics