Bug 1101490 - Implement a new component for Rooms database management

same here, early return not needed