Add custom not found handling