@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -207,12 +207,13 @@
 
 			close(_readPipe[1]);
 			close(_writePipe[0]);
 			OFFreeMemory(argv);
 
-			for (iter = env; *iter != NULL; iter++)
-				OFFreeMemory(*iter);
+			if (env != NULL)
+				for (iter = env; *iter != NULL; iter++)
+					OFFreeMemory(*iter);
 
 			OFFreeMemory(env);
 		}
 
 		objc_autoreleasePoolPop(pool);
@@ -329,12 +330,11 @@
 		_atEndOfStream = true;
 
 	return ret;
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
 	ssize_t bytesWritten;
 
 	if (_writePipe[1] == -1)
 		@throw [OFNotOpenException exceptionWithObject: self];