diff --git a/encompass-cs/Engine.cs b/encompass-cs/Engine.cs
index e0114d7..6ea51d0 100644
--- a/encompass-cs/Engine.cs
+++ b/encompass-cs/Engine.cs
@@ -223,7 +223,18 @@ namespace Encompass
             var existingRead = receiveTypes.Contains(typeof(ComponentMessage<TComponent>));
             if (existingRead && pendingRead)
             {
-                return componentMessageManager.ReadPendingComponentByEntityAndType<TComponent>(entity);
+                if (componentMessageManager.HasPendingComponent<TComponent>(entity))
+                {
+                    return componentMessageManager.ReadPendingComponentByEntityAndType<TComponent>(entity);
+                }
+                else if (componentMessageManager.HasExistingComponent<TComponent>(entity))
+                {
+                    return componentMessageManager.ReadExistingComponentByEntityAndType<TComponent>(entity);
+                }
+                else
+                {
+                    throw new NoComponentOfTypeOnEntityException("No Component of type {0} exists on Entity {1}", typeof(TComponent).Name, entity.ID);
+                }
             }
             else if (existingRead)
             {