Merge "Stop using not existing ShellCommandError exception class"