Improving AnnotatedBamException