Redirect errors fixing