Check for empty values, better errors