Fix "build_command_line" exception.

Fixes ZEN-9348.