Added null-strings check