Merge "added in null check for vf module in case it"