Quick and dirty fix for the exceptions

This fixes the issue we're having in production. It's dirty.  The real
fix will be for the controller to not be aware of the test data at
all. This is on my list of tasks to fix.