Merge "Properly check to see if a suppressor is present before returning it." into nyc-dev