Fix NPE when array is null
Update to 0.8.1