Fixed from main to email nullpointer: non-existent lists