fix WARN_ON handling some more