6.x

Fix for when no xml form association exists.