[FIX]: None Type attribute issues