Made Error Popups Everywhere
Merge remote-tracking branch 'origin/master'