fixes #2686
3.2.4-SNAPSHOT
change Exception, add individual tests and add checking for null array.