Restore queries crashes upon rollback

Reference to a non-existing cluster causes a NPE with catastrophic consequences