small changes
small null error fixes