Prevent empty entries