Fix early return issue

closes #4162 

Stupidest PR ever....