Issue #813 - S3 skipped when not available