Fix an NPE when looking up commands that do not technically exist