Avoid NPE if no cmd
Merge remote-tracking branch 'origin/master'