Check for , and . to avoid crash