Simplify error handling in a couple obscure cases
On createBucket Flush error, return the bucket

This isn't strictly necessary in general, but it does simplify the code
some since the result checking the error should have a similar thing
happen.