Make sure we're getting a dict
Merge pull request #8214 from UtahDave/develop

Make sure we're getting a dict