Hotfix for cleaning up the state if a cc payment fails.

Original issue reported by @bmcb. Thanks :-)