WK-403 Fix models to remove Python exceptions