Fixed error in args is None logic