Merge "exception scenario covered in AAIGraphTest.java"