Added try catch blocks for drop handler