#136: Remove error container