Index: src/XMPPExceptions.h
==================================================================
--- src/XMPPExceptions.h
+++ src/XMPPExceptions.h
@@ -69,12 +69,12 @@
  * \brief An exception indicating a stream error was received
  */
 @interface XMPPStreamErrorException: XMPPException
 {
 /// \cond internal
-	OFString *condition;
-	OFString *reason;
+	OFString *_condition;
+	OFString *_reason;
 /// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
 /// \brief The defined error condition specified by the stream error
@@ -120,12 +120,12 @@
  *	  did not apply to a string
  */
 @interface XMPPStringPrepFailedException: XMPPException
 {
 /// \cond internal
-	OFString *profile;
-	OFString *string;
+	OFString *_profile;
+	OFString *_string;
 /// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
 /// \brief The name of the stringprep profile that did not apply
@@ -170,12 +170,12 @@
  * \brief An exception indicating IDNA translation of a string failed
  */
 @interface XMPPIDNATranslationFailedException: XMPPException
 {
 /// \cond internal
-	OFString *operation;
-	OFString *string;
+	OFString *_operation;
+	OFString *_string;
 /// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
 /// \brief The IDNA translation operation which failed
@@ -220,11 +220,11 @@
  * \brief An exception indicating authentication failed
  */
 @interface XMPPAuthFailedException: XMPPException
 {
 /// \cond internal
-	OFString *reason;
+	OFString *_reason;
 /// \endcond
 }
 
 #ifdef OF_HAVE_PROPERTIES
 /// \brief The reason the authentication failed

Index: src/XMPPExceptions.m
==================================================================
--- src/XMPPExceptions.m
+++ src/XMPPExceptions.m
@@ -26,32 +26,32 @@
 
 #import "XMPPExceptions.h"
 #import "XMPPConnection.h"
 
 @implementation XMPPException
-+ exceptionWithClass: (Class)class_
-	  connection: (XMPPConnection*)conn
++ exceptionWithClass: (Class)class
+	  connection: (XMPPConnection*)connection
 {
-	return [[[self alloc] initWithClass: class_
-				 connection: conn] autorelease];
+	return [[[self alloc] initWithClass: class
+				 connection: connection] autorelease];
 }
 
-- initWithClass: (Class)class_
+- initWithClass: (Class)class
 {
 	Class c = [self class];
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
 {
-	self = [super initWithClass: class_];
+	self = [super initWithClass: class];
 
 	@try {
-		_connection = [conn retain];
+		_connection = [connection retain];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -65,46 +65,112 @@
 	[super dealloc];
 }
 
 - (XMPPConnection*)connection
 {
-	return _connection;
+	OF_GETTER(_connection, NO)
 }
 @end
 
 @implementation XMPPStreamErrorException
-+ exceptionWithClass: (Class)class_
-	  connection: (XMPPConnection*)conn
-	   condition: (OFString*)condition_
-	      reason: (OFString*)reason_;
-{
-	return [[[self alloc] initWithClass: class_
-				 connection: conn
-				  condition: condition_
-				     reason: reason_] autorelease];
++ exceptionWithClass: (Class)class
+	  connection: (XMPPConnection*)connection
+	   condition: (OFString*)condition
+	      reason: (OFString*)reason;
+{
+	return [[[self alloc] initWithClass: class
+				 connection: connection
+				  condition: condition
+				     reason: reason] autorelease];
+}
+
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
+{
+	Class c = [self class];
+	[self release];
+	@throw [OFNotImplementedException exceptionWithClass: c
+						    selector: _cmd];
+}
+
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
+      condition: (OFString*)condition
+	 reason: (OFString*)reason
+{
+	self = [super initWithClass: class
+			 connection: connection];
+
+	@try {
+		_condition = [condition copy];
+		_reason = [reason copy];
+	} @catch (id e) {
+		[self release];
+		@throw e;
+	}
+
+	return self;
+}
+
+- (void)dealloc
+{
+	[_condition release];
+	[_reason release];
+
+	[super dealloc];
+}
+
+- (OFString*)description
+{
+	return [OFString stringWithFormat:
+	    @"Got stream error in class %@: %@. Reason: %@!", [self inClass],
+	    _condition, _reason];
+}
+
+- (OFString*)condition
+{
+	OF_GETTER(_condition, NO)
+}
+
+- (OFString*)reason
+{
+	OF_GETTER(_reason, NO)
+}
+@end
+
+@implementation XMPPStringPrepFailedException
++ exceptionWithClass: (Class)class
+	  connection: (XMPPConnection*)connection
+	     profile: (OFString*)profile
+	      string: (OFString*)string
+{
+	return [[[self alloc] initWithClass: class
+				 connection: connection
+				    profile: profile
+				     string: string] autorelease];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
 {
 	Class c = [self class];
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
-      condition: (OFString*)condition_
-	 reason: (OFString*)reason_
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
+	profile: (OFString*)profile
+	 string: (OFString*)string
 {
-	self = [super initWithClass: class_
-			 connection: conn];
+	self = [super initWithClass: class
+			 connection: connection];
 
 	@try {
-		condition = [condition_ copy];
-		reason = [reason_ copy];
+		_profile = [profile copy];
+		_string = [string copy];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -111,66 +177,66 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[condition release];
-	[reason release];
+	[_profile release];
+	[_string release];
 
 	[super dealloc];
 }
 
 - (OFString*)description
 {
 	return [OFString stringWithFormat:
-	    @"Got stream error in class %@: %@. Reason: %@!", [self inClass],
-	    condition, reason];
+	    @"Stringprep with profile %@ failed in class %@ on string '%@'!",
+	    _profile, [self inClass], _string];
 }
 
-- (OFString*)condition
+- (OFString*)profile
 {
-	return condition;
+	OF_GETTER(_profile, NO)
 }
 
-- (OFString*)reason
+- (OFString*)string
 {
-	return reason;
+	OF_GETTER(_string, NO)
 }
 @end
 
-@implementation XMPPStringPrepFailedException
-+ exceptionWithClass: (Class)class_
-	  connection: (XMPPConnection*)conn
-	     profile: (OFString*)profile
+@implementation XMPPIDNATranslationFailedException
++ exceptionWithClass: (Class)class
+	  connection: (XMPPConnection*)connection
+	   operation: (OFString*)operation
 	      string: (OFString*)string
 {
-	return [[[self alloc] initWithClass: class_
-				 connection: conn
-				    profile: profile
+	return [[[self alloc] initWithClass: class
+				 connection: connection
+				  operation: operation
 				     string: string] autorelease];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
 {
 	Class c = [self class];
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
-	profile: (OFString*)profile_
-	 string: (OFString*)string_
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
+      operation: (OFString*)operation
+	 string: (OFString*)string
 {
-	self = [super initWithClass: class_
-			 connection: conn];
+	self = [super initWithClass: class
+			 connection: connection];
 
 	@try {
-		profile = [profile_ copy];
-		string = [string_ copy];
+		_operation = [operation copy];
+		_string = [string copy];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -177,66 +243,62 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[profile release];
-	[string release];
+	[_operation release];
+	[_string release];
 
 	[super dealloc];
 }
 
 - (OFString*)description
 {
 	return [OFString stringWithFormat:
-	    @"Stringprep with profile %@ failed in class %@ on string '%@'!",
-	    profile, [self inClass], string];
+	    @"IDNA operation %@ failed in class %@ on string '%@'!", _operation,
+	    [self inClass], _string];
 }
 
-- (OFString*)profile
+- (OFString*)operation
 {
-	return profile;
+	OF_GETTER(_operation, NO)
 }
 
 - (OFString*)string
 {
-	return string;
+	OF_GETTER(_string, NO)
 }
 @end
 
-@implementation XMPPIDNATranslationFailedException
-+ exceptionWithClass: (Class)class_
-	  connection: (XMPPConnection*)conn
-	   operation: (OFString*)operation
-	      string: (OFString*)string
-{
-	return [[[self alloc] initWithClass: class_
-				 connection: conn
-				  operation: operation
-				     string: string] autorelease];
+@implementation XMPPAuthFailedException
++ exceptionWithClass: (Class)class
+	  connection: (XMPPConnection*)connection
+	      reason: (OFString*)reason;
+{
+	return [[[self alloc] initWithClass: class
+				 connection: connection
+				     reason: reason] autorelease];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
 {
 	Class c = [self class];
 	[self release];
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
-      operation: (OFString*)operation_
-	 string: (OFString*)string_
+- initWithClass: (Class)class
+     connection: (XMPPConnection*)connection
+	 reason: (OFString*)reason
 {
-	self = [super initWithClass: class_
-			 connection: conn];
+	self = [super initWithClass: class
+			 connection: connection];
 
 	@try {
-		operation = [operation_ copy];
-		string = [string_ copy];
+		_reason = [reason copy];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -243,84 +305,22 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[operation release];
-	[string release];
-
-	[super dealloc];
-}
-
-- (OFString*)description
-{
-	return [OFString stringWithFormat:
-	    @"IDNA operation %@ failed in class %@ on string '%@'!", operation,
-	    [self inClass], string];
-}
-
-- (OFString*)operation
-{
-	return operation;
-}
-
-- (OFString*)string
-{
-	return string;
-}
-@end
-
-@implementation XMPPAuthFailedException
-+ exceptionWithClass: (Class)class_
-	  connection: (XMPPConnection*)conn
-	      reason: (OFString*)reason_;
-{
-	return [[[self alloc] initWithClass: class_
-				 connection: conn
-				     reason: reason_] autorelease];
-}
-
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
-{
-	Class c = [self class];
-	[self release];
-	@throw [OFNotImplementedException exceptionWithClass: c
-						    selector: _cmd];
-}
-
-- initWithClass: (Class)class_
-     connection: (XMPPConnection*)conn
-	 reason: (OFString*)reason_
-{
-	self = [super initWithClass: class_
-			 connection: conn];
-
-	@try {
-		reason = [reason_ copy];
-	} @catch (id e) {
-		[self release];
-		@throw e;
-	}
-
-	return self;
-}
-
-- (void)dealloc
-{
-	[reason release];
+	[_reason release];
 
 	[super dealloc];
 }
 
 - (OFString*)description
 {
 	return [OFString stringWithFormat:
 	    @"Authentication failed in class %@. Reason: %@!", [self inClass],
-	    reason];
+	    _reason];
 }
 
 - (OFString*)reason
 {
-	return reason;
+	OF_GETTER(_reason, NO)
 }
 @end