Fix for issue 'unexpected end of input' and updated error handling#7

Punie wants to merge 2 commits intojoshkatz:masterjoshkatz/r-script:masterfrom

Punie:masterPunie/r-script:masterCopy head branch name to clipboard