diff --git a/src/pyclaw/solver.py b/src/pyclaw/solver.py
index 6a6c73f3..72ce8e1c 100644
--- a/src/pyclaw/solver.py
+++ b/src/pyclaw/solver.py
@@ -218,6 +218,7 @@ def get_clawpack_dot_xxx(modname): return modname.rpartition('.')[0].rpartition(
 
         self.num_eqn   = None
         self.num_waves = None
+        self.fwave = None
 
         self.compute_gauge_values = default_compute_gauge_values
         r"""(function) - Function that computes quantities to be recorded at gauges"""
@@ -234,6 +235,7 @@ def get_clawpack_dot_xxx(modname): return modname.rpartition('.')[0].rpartition(
                 rp_name = rp_name.replace("_ptwise", "")
             self.num_eqn   = riemann.static.num_eqn.get(rp_name,None)
             self.num_waves = riemann.static.num_waves.get(rp_name,None)
+            self.fwave = riemann.static.fwave.get(rp_name,None)
 
         self._isinitialized = True
 
@@ -273,6 +275,9 @@ def is_valid(self):
         if self.num_eqn is None:
             valid = False
             reason = 'solver.num_eqn has not been set.'
+        if self.fwave is None:
+            valid = False
+            reason = 'solver.fwave has not been set.'
         if (None in self.bc_lower) or (None in self.bc_upper):
             valid = False
             reason = 'One of the boundary conditions has not been set.'