Don't update the devicevalues before returning success