Added more protection against atacks from command line injection