Fixed NPE in the console kill action.
Merge remote-tracking branch 'origin/master'