Prioritize sourceHandler over dataLocker
Merge pull request #496 from Flynsarmy/gridSourceHandler

Prioritize sourceHandler over dataLocker. Fixes #495