Fix SafeCall -- it was ignoring condition