JA Error handling and various fixes (ohShi)