Another NPE in command fixed.