More robust error-handling and deal with missing URLs.