removed null error