Fix super() calls and prepare error message field