Fix nullpoint