Removed IMakredService from the Core and added a null check.