diff --git a/kiri-gii/GiiCommand.php b/kiri-gii/GiiCommand.php
index 335a5e29..696cf8a7 100644
--- a/kiri-gii/GiiCommand.php
+++ b/kiri-gii/GiiCommand.php
@@ -52,8 +52,8 @@ class GiiCommand extends Command
 		$gii = Kiri::app()->get('gii');
 
 		$connections = Kiri::app()->get('db');
-		if ($input->hasArgument('databases')) {
-			$gii->run($connections->get($input->getArgument('databases')), $input);
+		if (($db = $input->getArgument('databases')) != null) {
+			$gii->run($connections->get($db), $input);
 			return 1;
 		}