FIX: Missing returns, and checks if records were passed