Found one more error to catch in CLAModel, and cleaned up code based on Scott's suggestions.