Limiting starting current of a small DC motor
What you need to correct this bad effect on your circuit is a flyback diode. It's a diode put in parallel of a motor, relay or any inductive load that create a voltage spike when power on (and so a current spike as well). 



In your comment you explain your worry about a short circuit because of that diode. This won't append. The diode conduct the current only when the voltage across the pin are higher than a certain amount. During the voltage spike, this condition is trigger and then the current flow across the diode (the red arrow on the picture). But during the reste of the time, the diode won't conduct.