added 500 error handling to settings page
Merge remote-tracking branch 'upstream/master'