Refactored Command to be using the newly refactored mapper instead of trying to map properties across manually itself.
If we're not successful in running the query - don't try to augment with client type information for "null"