Don't crash if no genre exists. Other misc fixes.