Some model save error improvements