974587: Add more checks for no order portion being present