diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
index 67cc8ed042..32f171b90d 100755
--- a/Classes/IRC/IRCClient.m
+++ b/Classes/IRC/IRCClient.m
@@ -4562,16 +4562,19 @@ - (void)receiveNumericReply:(IRCMessage *)m
 
 			break;
 		}
-		case 2 ... 4:
+		case 2:
+		case 3:
 		{
-			if ([m.sender.nick isNickname] == NO) {
-				[self.config setServer:m.sender.nick];
-			}
-
 			[self printReply:m];
 
 			break;
 		}
+		case 4:
+		{
+			[self.config setServer:[m paramAt:1]];
+
+			break;
+		}
 		case 5:
 		{
 			[self.isupport update:[m sequence:1] client:self];
diff --git a/Classes/Library/TLOFileLogger.m b/Classes/Library/TLOFileLogger.m
index 6aed404f2b..39899ef480 100755
--- a/Classes/Library/TLOFileLogger.m
+++ b/Classes/Library/TLOFileLogger.m
@@ -214,9 +214,9 @@ - (NSDictionary *)propertyList /* @private */
 	if (self.writePlainText == NO) {
 		NSError *readError;
 		
-		NSData *rawData = [NSString stringWithContentsOfFile:self.filename
-													encoding:NSUTF8StringEncoding
-													   error:&readError];
+		NSData *rawData = [NSData dataWithContentsOfFile:self.filename
+												 options:NSDataReadingUncached
+												   error:&readError];
 
 		if (readError) {
 			LogToConsole(@"Error Reading Property List: %@", [readError localizedDescription]);
diff --git a/Resources/Info.plist b/Resources/Info.plist
index 5ecfd4d02d..428db757eb 100755
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -47,8 +47,8 @@
 	<key>TXBundleBuildCodeName</key>
 	<string>Turtle Soup</string>
 	<key>TXBundleBuildNumber</key>
-	<string>12350</string>
+	<string>12354</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-rc1-309-g812b4f4-appstore</string>
+	<string>2.1.1-rc1-310-gac481a1-appstore</string>
 </dict>
 </plist>