Fix: Made API shutdown more robust
1 file changed