CRA-510, CRA-516: Added a fix to check if there is a value/filename or more sub-commands.
CRA-510, CRA-516: Added a fix to check if there is a value/filename or more sub-commands.