Update Elastic Box
Fix potential nullpointer bug
Make validation explicit