Fixed error dialog
Merge remote-tracking branch 'origin/jin/gui' into jolly/gui