MB-8952: Check if argument prefix is missing

Change-Id: Ic91661a02a71102276d4247a6547e89a8ae1b530