replace argumentnullexception with exception

[eric-urban]

For the short term this update uses the general Exception. Long term we can revisit when to use more specific exceptions e.g. InvalidArgumentException.