[BUGFIX] Ensure NULL or not empty array
Merge pull request #707 from bjo3rnf/formatfix

[BUGFIX] Ensure NULL or not empty array