Fixed a bug which tried to get the unit after it had been removed from
the table.