hyan/kamikaze — pull request #2 by sguo (2011-12-06 04:36:02+00:00)
Title: fix a possible NPE

Please verify this fix. Thanks.