Cleanup of Null Parameter message, fix for tests with no internet connection