Change to catch only specific errors for bad-id