Added aditional checks for savanna client import