Fixed complete/error check