spout update: properly release lock upon error
Merge branch 'sourceupdate-fixes'