As you can probably tell I vacillate quite a bit on this one.  I really should be consistent.  `riak_error` it is.