Move TODO list into session scope & improved error message output