Additional safety check
Merge pull request #107 from Zentific/aon_idx_bin_safety

Additional safety check