Fix redirect loop
implement type checking on received status