Improve check for D-Bus to fix for CLI version