hot fix - null is an object too