diff --git a/sao/src/rpc.js b/sao/src/rpc.js
index 8860a247a9..e45ef8be80 100644
--- a/sao/src/rpc.js
+++ b/sao/src/rpc.js
@@ -97,7 +97,9 @@
                     }
                 } else {
                     Sao.common.error.run(data.error[0], data.error[1])
-                        .always(dfd.reject);
+                        .always(function() {
+                            dfd.reject(data.error);
+                        });
                 }
             } else {
                 result = data.result;
diff --git a/sao/src/wizard.js b/sao/src/wizard.js
index 9b2010eefc..fb2d38d6cb 100644
--- a/sao/src/wizard.js
+++ b/sao/src/wizard.js
@@ -106,7 +106,10 @@
                     }
                     this.__processing = false;
                 }.bind(this), function(result) {
-                    // TODO end for server error.
+                    if (!result || !this.screen) {
+                        this.state = this.end_state;
+                        this.end();
+                    }
                     this.__processing = false;
                 }.bind(this));
             };