Added error handling without URL args