Added Validation.  Removed custom strlen