moved check of exiting question to below