backport 2 sanity checks from v5
*** empty log message ***