Fixed error view.
Merge branch 'hotfix/fixedErrorView'