improve error message for volume names that are too short Upstream-commit: b0b3249bc2265dcb7a290501dcc93c65f9265848 Component: engine