Merge "fix null dereference on aeli"