Added null check for Vaygrim