Fixing a exit problem with just returning None.