Started to add more details and checks for empty strings