Prioritize sourceHandler over dataLocker. Fixes #495