Merge "AafLurAndFish.java-logged exception"