Merge pull request #559 from mfycheng/master

Fix:558 Fix panic() from nil error