Empty list exception fix
Now really fixed it...