diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index f1152ec5..489dfd5b 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -320,11 +320,11 @@ void ssh_options_set_timeout(SSH_OPTIONS *opt, long seconds, long usec);
 int ssh_options_set_ssh_dir(SSH_OPTIONS *opt, const char *dir);
 int ssh_options_set_known_hosts_file(SSH_OPTIONS *opt, const char *dir);
 int ssh_options_set_identity(SSH_OPTIONS *opt, const char *identity);
+int ssh_options_set_banner(SSH_OPTIONS *opt, const char *banner);
 void ssh_options_allow_ssh1(SSH_OPTIONS *opt, int allow);
 void ssh_options_allow_ssh2(SSH_OPTIONS *opt, int allow);
 void ssh_options_set_dsa_server_key(SSH_OPTIONS *opt, const char *dsakey);
 void ssh_options_set_rsa_server_key(SSH_OPTIONS *opt, const char *rsakey);
-void ssh_options_set_banner(SSH_OPTIONS *opt, const char *banner);
 void ssh_options_set_log_function(SSH_OPTIONS *opt,
     void (*callback)(const char *message, SSH_SESSION *session, int verbosity ));
 void ssh_options_set_log_verbosity(SSH_OPTIONS *opt, int verbosity);
diff --git a/libssh/options.c b/libssh/options.c
index 6f8e9077..2696f6ef 100644
--- a/libssh/options.c
+++ b/libssh/options.c
@@ -456,14 +456,27 @@ void ssh_options_set_rsa_server_key(SSH_OPTIONS *opt, const char *rsakey){
     opt->rsakey=strdup(rsakey);
 }
 
-/** \brief set the server banner sent to clients
- * \param opt options structure
- * \param banner a text banner to be shown
+/**
+ * @brief Set the server banner sent to clients.
+ *
+ * @param opt           The options structure to use.
+ *
+ * @param banner        A text banner to be shown.
+ *
+ * @return 0 on success, < 0 on error.
  */
-void ssh_options_set_banner(SSH_OPTIONS *opt, const char *banner){
-    if(opt->banner)
-        free(opt->banner);
-    opt->banner=strdup(banner);
+int ssh_options_set_banner(SSH_OPTIONS *opt, const char *banner) {
+  if (opt == NULL || banner == NULL) {
+    return -1;
+  }
+
+  SAFE_FREE(opt->banner);
+  opt->banner = strdup(banner);
+  if (opt->banner == NULL) {
+    return -1;
+  }
+
+  return 0;
 }
 
 /** the methods are:\n