Fixed bug that could hangup the handle cache and therefore the UI