Added some error checking in places that didn't have it.  Restructured the names in the utils class.