Code review comment for lp:~lifeless/storm/bug-620615

As we discussed online, there's an actual bug here. The runtime error is protecting from data corruption. With Robert's help, we've figured what was wrong, and I'll produce a branch with actual tests soonish.