Added detalied error for complex commands
Merge remote-tracking branch 'upstream/master'