Avoid nullpointer exception in case of incorrect bundle drop