Add checks for table existing before drop