diff --git a/Source/driver/Castro.cpp b/Source/driver/Castro.cpp
index d3fe48b979..11d10c1b9d 100644
--- a/Source/driver/Castro.cpp
+++ b/Source/driver/Castro.cpp
@@ -306,7 +306,15 @@ Castro::read_params ()
 #elif (AMREX_SPACEDIM == 2)
     if ( dgeom.IsSPHERICAL() )
       {
-        amrex::Abort("We don't support spherical coordinate systems in 2D");
+        if ( (dgeom.ProbLo(1) < 0.0_rt) && (dgeom.ProbHi(1) > M_PI) )
+        {
+          amrex::Abort("Theta must be within [0, Pi] for spherical coordinate system in 2D");
+        }
+
+        if ( dgeom.ProbLo(0) < static_cast<Real>(NUM_GROW) * dgeom.CellSize(0) )
+        {
+          amrex::Abort("R-min must be large enough so ghost cells doesn't extend to negative R");
+        }
       }
 #elif (AMREX_SPACEDIM == 3)
     if ( dgeom.IsRZ() )
diff --git a/Source/gravity/Gravity.cpp b/Source/gravity/Gravity.cpp
index edeb7359d2..82003be86f 100644
--- a/Source/gravity/Gravity.cpp
+++ b/Source/gravity/Gravity.cpp
@@ -121,13 +121,6 @@ Gravity::read_params ()
                 amrex::Abort("Options are ConstantGrav, PoissonGrav, or MonopoleGrav");
              }
 
-        if (  gravity::gravity_type == "ConstantGrav")
-        {
-          if ( dgeom.IsSPHERICAL() ) {
-              amrex::Abort("Can't use constant direction gravity with non-Cartesian coordinates");
-          }
-        }
-
 #if (AMREX_SPACEDIM == 1)
         if (gravity::gravity_type == "PoissonGrav")
         {