Localized ErrorReason
Added onError handler to MainController
Merge remote-tracking branch 'origin/master'