try/catch blocks and whitespace changes to make it consistent with questor's style.