added null checks to fillable object