Added a couple of catches for missing records