Updated to check some return codes to reduce FPs
Fixes to minimise FPs