Index: src/OFHTTPClient.m
==================================================================
--- src/OFHTTPClient.m
+++ src/OFHTTPClient.m
@@ -14,11 +14,11 @@
  * file.
  */
 
 #include "config.h"
 
-#define OF_HTTP_REQUEST_M
+#define OF_HTTP_CLIENT_M
 
 #include <string.h>
 #include <ctype.h>
 
 #import "OFHTTPClient.h"
@@ -43,12 +43,13 @@
 #import "macros.h"
 
 Class of_http_client_tls_socket_class = Nil;
 
 static OF_INLINE void
-normalize_key(char *str)
+normalize_key(char *str_)
 {
+	uint8_t *str = (uint8_t*)str_;
 	BOOL firstLetter = YES;
 
 	while (*str != '\0') {
 		if (!isalnum(*str)) {
 			firstLetter = YES;
@@ -282,10 +283,11 @@
 		@try {
 			key = [OFString stringWithUTF8StringNoCopy: keyC
 						      freeWhenDone: YES];
 		} @catch (id e) {
 			free(keyC);
+			@throw e;
 		}
 
 		do {
 			tmp++;
 		} while (*tmp == ' ');