Merge remote-tracking branch 'remotes/origin/develop/wap' into stable/wap

@@ -64,6 +64,10 @@ class ClassModel
                             'gender' => $genderArr[$k]), 'list')
                     );
 
+                    if(!isset($val['sub'])) {
+                        continue;
+                    }
+                    
                     $subitem = array();
                     foreach ($val['sub'] as $value) {
                         $subitem = array();