Added non null/empty string checks on dependency setups.