fixed some crashing issues with calls/messages