@FlaxenFlash Definitely check for a null shape with Guard.NotNull