Better error handling & logging for missing Criteria