Added guards to Drop module