Fixing bug. Handling nulls in etage and doer