LP#1773417 Improve empty volume handling