CFY-1433 add assertions