Fixed nullpoint exceptions, added list assertation