Various exception related changed. Using empty list as null