Add argument security check