Add more error checking of properties