Added new genre and fixed a null case.