Updated admin_menu to latest dev release and made an edit to prevent an annoying error. Hopefully the next release of the module will fix the bug in this one and my hack won't be needed.