Possible exception fix for using command without arguments