jeffh Added null checking for height key.