Small cleanup to propgate errors

Also, adding some more fixes around releasing locks on stop to
enable fast shutdown.