Issue #277 - Add more checks before reverting to http