error var name && unknown item

http://rathena.org/board/topic/86685-web-vending-database-standalone-and-fluxcp-addon/?p=228437

merchant_db_flux/vending/modules/vending/index.php

@@ -12,7 +12,10 @@ function get_item_name($id, $server)
 			$sth->execute();
 			$r = $sth->fetch();
 			$slots = ($r->slots > 0) ? "[{$r->slots}]":""; 
-			return $r->name_japanese.$slots;
+			if(!empty($r->name_japanese))
+				return $r->name_japanese.$slots;
+			else
+				return "Unknown Item";
 		}
 		else
 		{

merchant_db_flux/vending/themes/default/vending/index.php

@@ -96,8 +96,8 @@
 			<?php echo htmlspecialchars($char->merchant_name) ?>
 			<?php endif ?>
 		</td>
-		<td title="<?php echo htmlspecialchars($char->shop2) ?>">
-			<?php echo htmlspecialchars($char->shop) ?>
+		<td title="<?php echo htmlspecialchars($char->name2) ?>">
+			<?php echo htmlspecialchars($char->name) ?>
 		</td>
 		<td>
 			<span class='mapinfo' data-map='<?=$char->last_map?>' data-x='<?=$char->last_x?>' data-y='<?=$char->last_y?>'><?php echo htmlspecialchars($char->last_map)." ".htmlspecialchars($char->last_x).",".htmlspecialchars($char->last_y) ?></span>