Updated with a fix for the crash. Was just a bit of menu navigation code that was more clever than it needed to be ;)
