Fix IllegalArgumentException caused by null arrays
Merge pull request #6 from kitskub/master

Fix IllegalArgumentException caused by null arrays