diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 93a1ae867c..43953a7eff 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -112,7 +112,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             else
             {            
                 // TODO: Really need a proper copy constructor down in libopenmetaverse
-                return MediaEntry.FromOSD(media[face].GetOSD());                        
+                MediaEntry me = media[face];                
+                return (null == me ? null : MediaEntry.FromOSD(me.GetOSD()));                        
             }
         }