Fix NPE and return 'Partially_OK' now