Life saver! Merging in your changes fixed it for me as well. Can't believe this obvious of a crash bug is sitting out there in the "latest stable" version of these plugins.