Updated to latest libusbwrap, tidied error handling