IOT-3213 Handle reset code properly