Bug fix. Added initial argument checking.