Changed to ArgumentException and removed background NRE