Fix inappropriate use of empty(), it should only be used when you want to suppress...