Cleaned up error handling, added empty URL warnings