Removed null string warning