Fixed the null error