Error handling fixes
Applied GoFmt