Code pro fixes

Not really sure. I just went through and removed code in comments. Do you think we should make this a PopupErrorHandler?