Add missing 'require' statements
Make error message for missing CLI command more useful