Merge "Return error from gatekeeperd"