fixed null images issue & added more logs