Better value checking