adjust when IncludeException is thrown; add IsParentCommand