diff --git a/SimPEG/EM/FDEM/FDEM.py b/SimPEG/EM/FDEM/FDEM.py
index 260907f5..a20f1dc7 100644
--- a/SimPEG/EM/FDEM/FDEM.py
+++ b/SimPEG/EM/FDEM/FDEM.py
@@ -383,40 +383,40 @@ class ProblemFDEM_b(BaseFDEMProblem):
         if self._makeASymmetric and adjoint:
             v = self.MfMui * v
 
-        if S_e is not None:
-            MeSigmaIDeriv = self.MeSigmaIDeriv(S_e)
-            if not adjoint:
-                RHSderiv = C * (MeSigmaIDeriv * v)
-            elif adjoint:
-                RHSderiv = MeSigmaIDeriv.T * (C.T * v)
-        else:
-            RHSderiv = None
+        # if S_e is not None:
+        MeSigmaIDeriv = self.MeSigmaIDeriv(S_e)
+        if not adjoint:
+            RHSderiv = C * (MeSigmaIDeriv * v)
+        elif adjoint:
+            RHSderiv = MeSigmaIDeriv.T * (C.T * v)
+        # else:
+        #     RHSderiv = None
 
         S_mDeriv, S_eDeriv = src.evalDeriv(self, adjoint)
         S_mDeriv, S_eDeriv = S_mDeriv(v), S_eDeriv(v)
-        if S_mDeriv is not None and S_eDeriv is not None:
-            if not adjoint:
-                SrcDeriv = S_mDeriv + C * (self.MeSigmaI * S_eDeriv)
-            elif adjoint:
-                SrcDeriv = S_mDeriv + Self.MeSigmaI.T * ( C.T * S_eDeriv)
-        elif S_mDeriv is not None:
-            SrcDeriv = S_mDeriv
-        elif S_eDeriv is not None:
-            if not adjoint:
-                SrcDeriv = C * (self.MeSigmaI * S_eDeriv)
-            elif adjoint:
-                SrcDeriv = self.MeSigmaI.T * ( C.T * S_eDeriv)
-        else:
-            SrcDeriv = None
+        # if S_mDeriv is not None and S_eDeriv is not None:
+        if not adjoint:
+            SrcDeriv = S_mDeriv + C * (self.MeSigmaI * S_eDeriv)
+        elif adjoint:
+            SrcDeriv = S_mDeriv + Self.MeSigmaI.T * ( C.T * S_eDeriv)
+        # elif S_mDeriv is not None:
+        #     SrcDeriv = S_mDeriv
+        # elif S_eDeriv is not None:
+        #     if not adjoint:
+        #         SrcDeriv = C * (self.MeSigmaI * S_eDeriv)
+        #     elif adjoint:
+        #         SrcDeriv = self.MeSigmaI.T * ( C.T * S_eDeriv)
+        # else:
+        #     SrcDeriv = None
 
-        if RHSderiv is not None and SrcDeriv is not None:
-            RHSderiv += SrcDeriv
-        elif SrcDeriv is not None:
-            RHSderiv = SrcDeriv
+        # if RHSderiv is not None and SrcDeriv is not None:
+        RHSderiv += SrcDeriv
+        # elif SrcDeriv is not None:
+        #     RHSderiv = SrcDeriv
 
-        if RHSderiv is not None:
-            if self._makeASymmetric is True and not adjoint:
-                return MfMui.T * RHSderiv
+        # if RHSderiv is not None:
+        if self._makeASymmetric is True and not adjoint:
+            return MfMui.T * RHSderiv
 
         return RHSderiv
 
diff --git a/SimPEG/EM/FDEM/FieldsFDEM.py b/SimPEG/EM/FDEM/FieldsFDEM.py
index 103ba821..00b0d155 100644
--- a/SimPEG/EM/FDEM/FieldsFDEM.py
+++ b/SimPEG/EM/FDEM/FieldsFDEM.py
@@ -145,8 +145,8 @@ class FieldsFDEM_b(FieldsFDEM):
         e = self._MeSigmaI * ( self._edgeCurl.T * ( self._MfMui * bSolution))
         for i,src in enumerate(srcList):
             _,S_e = src.eval(self.prob)
-            if S_e is not None:
-                e[:,i] += -self._MeSigmaI * S_e
+            # if S_e is not None:
+            e[:,i] += -self._MeSigmaI * S_e
         return e
 
     def _eSecondaryDeriv_u(self, src, v, adjoint=False):
@@ -164,8 +164,8 @@ class FieldsFDEM_b(FieldsFDEM):
             Me = Me.T
 
         w = self._edgeCurl.T * (self._MfMui * bSolution)
-        if S_e is not None:
-            w += -Utils.mkvc(Me * S_e,2)
+        # if S_e is not None:
+        w += -Utils.mkvc(Me * S_e,2)
 
         if not adjoint:
             de_dm = self._MeSigmaIDeriv(w) * v