Fixed crashes due to empty strings