So, I got the camera back yesterday from the service center at Canon. It had a repair slip that read "repaired". Not exactly a great explanation. I was so excited to get the camera back, that I took a picture of the only thing in the house I hadn't taken a picture of yet....biscuits.
I'd also like to note that shortly after taking this picture, the error returned! So, I'm shipping the camera back to Canon again. What a pain. I'm going to keep the camera over the weekend so that hopefully I can get some good shots and then send the camera back on Monday.