Worked out the proper fix for the issue that earlier in the day I just did a hacky work around to prevent crashing. Also a hacky work around to deal with the visual regression.