Add check for strlen