Trunk 4446: Support deriving auto_expire_date from duration and duration units for Drug Orders

Changes for ticket https://issues.openmrs.org/browse/TRUNK-4446
You need a null check here and just return null immediately, you should not be calling addToDate with a null value