Fix a missing function and dont blow up on delivery receipts