The largest hobby drone maker in the world is DJI, a Chinese company that has about an 80% share of the market.
European marketing director Kevin Gordon told the BBC that a number of safety features were already included in the firm's latest Phantom quadcopter drones.
"You cannot fly to the point where the batteries are exhausted," he said. "If you get to 10% of battery life it will automatically return to home and land."
Another feature is geo-fencing - using onboard GPS and mapping systems to stop drones flying into restricted airspace.
"This is a solution to reduce airport incursion incidents," he said. "It's important that we don't allow people to fly in places they shouldn't."