Index: trunk/Mars/mastro/MAstroCatalog.cc
===================================================================
--- trunk/Mars/mastro/MAstroCatalog.cc	(revision 11873)
+++ trunk/Mars/mastro/MAstroCatalog.cc	(revision 12763)
@@ -721,6 +721,8 @@
     }
 
-    MVector3 *star = static_cast<MVector3*>(FindObject(name ? name : g.GetName()));
-    if (!star)
+    const Bool_t ismoon = TString(name).CompareTo("moon", TString::kIgnoreCase)==0;
+
+    MVector3 *star = ismoon ? 0 : static_cast<MVector3*>(FindObject(name ? name : g.GetName()));
+    if (!star && !ismoon)
         return;
 
@@ -737,5 +739,12 @@
         const MTime tm(mjd-lng+offset);
 
-        MVector3 v(*star);
+        MVector3 v = star ? *star : MVector3();
+        if (!star)
+        {
+            Double_t ra, dec;
+            MAstro::GetMoonRaDec(tm.GetMjd(), ra, dec);
+            v = MVector3(ra, dec);
+        }
+
         v *= MAstroSky2Local(tm.GetGmst(), *fObservatory);