failing test for #2495
fix #2498
replace `store_error()` with `store_result()`
remove commented code
Merge pull request #2531 from gittip/fix-2498

Fix 2498