Merge "Add better error message for unsupported classfile"