Fix null pointer - remove debug