Bit more defensive programming in consumer