Add checks in juggler now