Fixed Unexpected Argument Crashes

This should have fixed the crashes. I tested as much as I could think
of, but it would of course be good to test more.