VOLDEV-2: Add controller check