Need help putting a border around images with without captions

[historicshed 0]

I have been able to put a border around my photos with captions, and I have been able to put a border around photos with no captions, but I am not able to get them both up at the same time without seeing a double border. An example page is at HistoricShed.com (the image with no caption is about halfway down the page). How can I get the outer border on photos with captions and the inner border on images without captions?

[cmunns 16]

I would get rid of the tbody outer border, and apply a bottom,left, and right border to the caption itself assuming you can have the width be the same as the image. Otherwise do the opposite of what I said and only have the outer tbody border, which actually might make more sense, but ultimately tidiness probably lies in caption and image width being the same.