Break out the function loading into a seperate if block
Merge pull request #9596 from jacksontj/develop

Break out the function loading into a seperate if block