[mt678] Fix possible client crashes.