diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index 0c8a4df6..8d05c0e9 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-13  Marcus Brinkmann  <marcus@gnu.org>
+
+	* assuan-buffer.c (assuan_read_line): Fix order of execution to
+	get correct return values.
+
 2001-12-13  Werner Koch  <wk@gnupg.org>
 
 	* assuan-handler.c (assuan_get_active_fds): Fixed silly bug,
diff --git a/assuan/assuan-buffer.c b/assuan/assuan-buffer.c
index 50900c42..ee085d0c 100644
--- a/assuan/assuan-buffer.c
+++ b/assuan/assuan-buffer.c
@@ -172,11 +172,15 @@ _assuan_read_line (ASSUAN_CONTEXT ctx)
 AssuanError
 assuan_read_line (ASSUAN_CONTEXT ctx, char **line, size_t *linelen)
 {
+  AssuanError err;
+
   if (!ctx)
     return ASSUAN_Invalid_Value;
+
+  err = _assuan_read_line (ctx);
   *line = ctx->inbound.line;
   *linelen = ctx->inbound.linelen;
-  return _assuan_read_line (ctx);
+  return err;
 }