better handling of nsa exceptions
better handling of nsa exceptions

sdss/marvin,albireox/marvin,albireox/marvin,albireox/marvin,bretthandrews/marvin,sdss/marvin,bretthandrews/marvin,sdss/marvin,albireox/marvin,bretthandrews/marvin,bretthandrews/marvin,sdss/marvin