diff --git a/UnrealEngine/Plugins/JSBSimFlightDynamicsModel/Source/JSBSimFlightDynamicsModelEditor/Private/JSBSimMovementCompVisualizer.cpp b/UnrealEngine/Plugins/JSBSimFlightDynamicsModel/Source/JSBSimFlightDynamicsModelEditor/Private/JSBSimMovementCompVisualizer.cpp
index a6a82370db..16d89f3865 100644
--- a/UnrealEngine/Plugins/JSBSimFlightDynamicsModel/Source/JSBSimFlightDynamicsModelEditor/Private/JSBSimMovementCompVisualizer.cpp
+++ b/UnrealEngine/Plugins/JSBSimFlightDynamicsModel/Source/JSBSimFlightDynamicsModelEditor/Private/JSBSimMovementCompVisualizer.cpp
@@ -52,6 +52,11 @@ FJSBSimMovementCompVisualizer::~FJSBSimMovementCompVisualizer()
 void FJSBSimMovementCompVisualizer::DrawVisualization(const UActorComponent* Component, const FSceneView* View, FPrimitiveDrawInterface* PDI)
 {
 	const UJSBSimMovementComponent* MovementComponent = Cast<UJSBSimMovementComponent>(Component);
+	if (!MovementComponent)
+	{
+		return;
+	}
+
 	AActor* Owner = Component->GetOwner();
 
 	// Make sure we are ready to visualize this component
@@ -101,6 +106,11 @@ void FJSBSimMovementCompVisualizer::DrawVisualization(const UActorComponent* Com
 void FJSBSimMovementCompVisualizer::DrawVisualizationHUD(const UActorComponent* Component, const FViewport* Viewport, const FSceneView* View, FCanvas* Canvas)
 {
 	const UJSBSimMovementComponent* MovementComponent = Cast<UJSBSimMovementComponent>(Component);
+	if (!MovementComponent)
+	{
+		return;
+	}
+
 	AActor* Owner = MovementComponent->GetOwner();
 
 	FVector2D PixelLocation;