Changed Unhandled exception to ArgumentException