diff --git a/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java b/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java
index b8e8f341a3431c32bbdb54fc1e649f970cac6332..49fcf0c85b1cef2618305454449c582578dbb084 100644
--- a/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java
+++ b/src/main/java/fr/soleil/bensikin/options/ReadWriteOptionBook.java
@@ -1,4 +1,4 @@
-//+======================================================================
+// +======================================================================
 // $Source: /cvsroot/tango-cs/tango/tools/bensikin/bensikin/options/ReadWriteOptionBook.java,v $
 //
 // Project:      Tango Archiving Service
@@ -147,11 +147,14 @@ public class ReadWriteOptionBook {
      *            Map of size 2.
      */
     public void build(Collection<Map<String, String>> options) {
-        for (Map<String, String> nextOption : options) {
-            String nextName = nextOption.get(ReadWriteOptionBook.NAME_TAG);
-            String nextValue = nextOption.get(ReadWriteOptionBook.VALUE_TAG);
-            this.putOption(nextName, nextValue);
+        if (options != null) {
+            for (Map<String, String> nextOption : options) {
+                String nextName = nextOption.get(ReadWriteOptionBook.NAME_TAG);
+                String nextValue = nextOption.get(ReadWriteOptionBook.VALUE_TAG);
+                if ((nextName != null) && (nextValue != null)) {
+                    putOption(nextName, nextValue);
+                }
+            }
         }
-
     }
 }