Base: Improve submission URL and error checking