adjust scope of locking at source initialisation, fixes possible deadlock bug with relay