Fixed the yellow screen bug, truly, for real this time.