Fix return url catching
Testing