implement Consider switching data factory IllegalArgumentExceptions to
NullPointerExceptions #131