Remove extraneous if statement, add additional assertions