Minor edit

Got rid of stop and returned NULL instead