Don't exit, just return
refs #3107
Merge commit 'f4212941f9dec856055c7ff875412884e66b9faa'