master
volume: return error instead of panicking on handler registration
clean up: remove loop variable capture