Fix a few crashes/hangs from general QS use
Fix some static analyzer findings
re-add the required entryName NSString
Merge pull request #1425 from pjrobertson/improv

Fix a few crashes/hangs from general QS use