Update import tool to be safe

closes #1681

- issue fixed, tests required!