Hotfix - FIxed undefined index warnings.