Change to support user not setting a drawable

Changes for a bug involving not defining a drawable.