Merge pull request #154 from AndreLesa/zhcard_dev

Merge error page changes.