Fixed small issue with removing tenant not being available