Fixed play, delete a row and null checking