Add better error checking
Add better error checking

lcheylus/haka,haka-security/haka,nabilbendafi/haka,Wingless-Archangel/haka,lcheylus/haka,lcheylus/haka,Wingless-Archangel/haka,LubyRuffy/haka,nabilbendafi/haka,haka-security/haka,haka-security/haka,nabilbendafi/haka,LubyRuffy/haka