Index: src/OFString_UTF8.m
==================================================================
--- src/OFString_UTF8.m
+++ src/OFString_UTF8.m
@@ -396,24 +396,24 @@
 	self = [super init];
 
 	@try {
 		size_t UTF8StringLength = strlen(UTF8String);
 
+		_s = &_storage;
+
+		if (freeWhenDone)
+			_s->freeWhenDone = UTF8String;
+
 		if (UTF8StringLength >= 3 &&
 		    memcmp(UTF8String, "\xEF\xBB\xBF", 3) == 0) {
 			UTF8String += 3;
 			UTF8StringLength -= 3;
 		}
 
-		_s = &_storage;
-
 		_s->cString = (char *)UTF8String;
 		_s->cStringLength = UTF8StringLength;
 
-		if (freeWhenDone)
-			_s->freeWhenDone = UTF8String;
-
 		switch (of_string_utf8_check(UTF8String, UTF8StringLength,
 		    &_s->length)) {
 		case 1:
 			_s->isUTF8 = true;
 			break;