Fixed null check, faster asset search and also removed some debug