handle exception for popup window
Merge branch 'master' into develop