Added null check as per latest version on Codeplex