@@ -51,11 +51,11 @@
 		const unsigned char *dataCArray = [data items];
 
 		_certificate = d2i_X509(NULL, &dataCArray, [data count]);
 		if (_certificate == NULL)
 			@throw [OFInitializationFailedException
-				    exceptionWithClass: [self class]];
+			    exceptionWithClass: [self class]];
 
 		[pool release];
 	} @catch (id e) {
 		[self release];
 		@throw e;
@@ -70,11 +70,11 @@
 
 	@try {
 		_certificate = X509_dup(certificate);
 		if (_certificate == NULL)
 			@throw [OFInitializationFailedException
-				    exceptionWithClass: [self class]];
+			    exceptionWithClass: [self class]];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -419,12 +419,11 @@
 {
 	OFString *ret;
 	char *buffer;
 
 	if (ASN1_STRING_to_UTF8((unsigned char**)&buffer, str) < 0)
-		@throw [OFInvalidEncodingException
-		    exceptionWithClass: [self class]];
+		@throw [OFInvalidEncodingException exception];
 
 	@try {
 		ret = [OFString stringWithUTF8String: buffer];
 	} @finally {
 		OPENSSL_free(buffer);