Add checks for potentially missing input entities