1 files changed, 12 insertions, 3 deletions

diff --git a/src/commands.c b/src/commands.c
index 6afd5cd..d515042 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -385,15 +385,24 @@ read_scramble(int c, char **v, CommandArgs *args)
         int i, k, n;
         unsigned int j;
         char *algstr;
+        Alg *aux;
 
-        if (c < 1 || new_alg(v[0])->len == 0) {
-                fprintf(stderr, "Error reading scramble\n");
+        if (c < 1) {
+                fprintf(stderr, "Error: no scramble given?\n");
                 return false;
         }
 
         n = 0;
-        for(i = 0; i < c; i++)
+        for(i = 0; i < c; i++) {
+                aux = new_alg(v[i]);
+                if (aux->len == 0) {
+                        fprintf(stderr, "Error: %s unrecognized\n", v[i]);
+                        free(aux);
+                        return false;
+                }
+                free(aux);
                 n += strlen(v[i]);
+        }
 
         algstr = malloc((n + 1) * sizeof(char));
         k = 0;