Fix for Issue #12

Makes sure that there is both a null check on additionalProperties and that we do not end up with a "list within a list".