diff --git a/gtsam/slam/SmartFactorBase.h b/gtsam/slam/SmartFactorBase.h
index 02cd68304..c9421e173 100644
--- a/gtsam/slam/SmartFactorBase.h
+++ b/gtsam/slam/SmartFactorBase.h
@@ -258,24 +258,21 @@ public:
   }
 
   /// Computes Point Covariance P from E
-  static Matrix3 PointCov(Matrix& E) {
+  static Matrix PointCov(Matrix& E) {
     return (E.transpose() * E).inverse();
   }
 
   /// Computes Point Covariance P, with lambda parameter
-  static Matrix3 PointCov(Matrix& E, double lambda,
+  static Matrix PointCov(Matrix& E, double lambda,
       bool diagonalDamping = false) {
 
-    Matrix3 EtE = E.transpose() * E;
+    Matrix EtE = E.transpose() * E;
 
     if (diagonalDamping) { // diagonal of the hessian
-      EtE(0, 0) += lambda * EtE(0, 0);
-      EtE(1, 1) += lambda * EtE(1, 1);
-      EtE(2, 2) += lambda * EtE(2, 2);
+      EtE.diagonal() += lambda * EtE.diagonal();
     } else {
-      EtE(0, 0) += lambda;
-      EtE(1, 1) += lambda;
-      EtE(2, 2) += lambda;
+      DenseIndex n = E.cols();
+      EtE += lambda * Eigen::MatrixXd::Identity(n,n);
     }
 
     return (EtE).inverse();
diff --git a/gtsam/slam/SmartProjectionFactor.h b/gtsam/slam/SmartProjectionFactor.h
index 51f892a6d..7ab26c0a1 100644
--- a/gtsam/slam/SmartProjectionFactor.h
+++ b/gtsam/slam/SmartProjectionFactor.h
@@ -280,7 +280,7 @@ public:
     {
       std::vector<typename Base::KeyMatrix2D> Fblocks;
       f = computeJacobiansWithTriangulatedPoint(Fblocks, E, b, cameras);
-      Base::whitenJacobians(Fblocks,E,b);
+      Base::whitenJacobians(Fblocks, E, b);
       Base::FillDiagonalF(Fblocks, F); // expensive !
     }
 
@@ -290,7 +290,8 @@ public:
     Matrix H(Base::Dim * numKeys, Base::Dim * numKeys);
     Vector gs_vector;
 
-    Matrix3 P = Base::PointCov(E, lambda);
+    // Note P can 2*2 or 3*3
+    Matrix P = Base::PointCov(E, lambda);
 
     // Create reduced Hessian matrix via Schur complement F'*F - F'*E*P*E'*F
     H.noalias() = F.transpose() * (F - (E * (P * (E.transpose() * F))));
@@ -448,29 +449,29 @@ public:
     else
       result_ = triangulateSafe(cameras);
 
-    // if we don't want to manage the exceptions we discard the factor
-    if (!manageDegeneracy_ && !result_)
-      return 0.0;
-
-    if (isPointBehindCamera()) { // if we want to manage the exceptions with rotation-only factors
-      std::cout
-          << "SmartProjectionHessianFactor: cheirality exception (this should not happen if CheiralityException is disabled)!"
-          << std::endl;
-    }
-
-    if (isDegenerate()) {
-      // return 0.0; // TODO: this maybe should be zero?
-      std::cout
-          << "SmartProjectionHessianFactor: trying to manage degeneracy (this should not happen is manageDegeneracy is disabled)!"
-          << std::endl;
-      // 3D parameterization of point at infinity
-      const Point2& z0 = this->measured_.at(0);
-      result_ = TriangulationResult(
-          cameras.front().backprojectPointAtInfinity(z0));
-      return Base::totalReprojectionErrorAtInfinity(cameras, *result_);
-    } else {
-      // Just use version in base class
+    if (result_)
+      // All good, just use version in base class
       return Base::totalReprojectionError(cameras, *result_);
+    else {
+      // if we don't want to manage the exceptions we discard the factor
+      if (!manageDegeneracy_)
+        return 0.0;
+
+      if (isPointBehindCamera()) { // if we want to manage the exceptions with rotation-only factors
+        throw std::runtime_error(
+            "SmartProjectionFactor::totalReprojectionError does not handle point behind camera yet");
+      }
+
+      if (isDegenerate()) {
+        // 3D parameterization of point at infinity
+        const Point2& z0 = this->measured_.at(0);
+        result_ = TriangulationResult(
+            cameras.front().backprojectPointAtInfinity(z0));
+        return Base::totalReprojectionErrorAtInfinity(cameras, *result_);
+      }
+      // should not reach here. TODO use switch
+      throw std::runtime_error(
+          "SmartProjectionFactor::totalReprojectionError internal error");
     }
   }