catch spots where returnAfter is missing