Avoid dialogs empty exception
Merge pull request #70 from KKBOX/master_daniel

Avoid dialogs empty exception
Revert commit 2999da0eaa02a70ef28aedb95993bd3b5f897638