Added more checks for points loading