Fix BlacklistCommand and WhitelistCommand trying to get a target even when not required