Improve handling of missing/incorrect data