More status check in the main base parser.

Small improvement for GH-335.
CHANGELOG for GH-335