I think the best solution would be something akin to Skyrim's approach - inform the player of the "Empty" status before the container is interacted with. Like seeing "Barrel (empty)" upon hovering the cursor over the object.