Add exception handle on NonExistsButton
Merge remote-tracking branch 'origin/master'