Added some more argument checks for #78576058