Fixed handling for when parser is not passed in