Minor change, handles null cells