narrowed scope of signals we catch and some nil checks