Check more return values in the SRP code