Updated error checking in catman and rawman