FS-6208 --resolve that patch is correct but this other code will protect the seg in either case