122 - quick and dirty fix for production error.  Model validation in future story (Joe)
Merge branch '122'