Merge "Fix crash in AppErrors and clean up code"