Removing all empty() and checking for empty string now