Check for value in command

Merged Felix Delattre requested to merge feature/check-for-value-in-command into master

\approve @marius

Merge request reports