Fix for error, don't always add xml form steps.
Merge pull request #89 from nigelgbanks/7.x-fix-for-fatal-error

Fix Error