Added error message to commandwindow
Merge remote-tracking branch 'origin/master'