Changed handling of dynamic arguments
Improved exception message