Added error class to container when overwritten.
Merge branch 'develop'