diff --git a/w3/browser/components/SingleStudent.js b/w3/browser/components/SingleStudent.js
index 695699b..2257aee 100644
--- a/w3/browser/components/SingleStudent.js
+++ b/w3/browser/components/SingleStudent.js
@@ -10,9 +10,11 @@ const avgGrade = tests => {
 
 const SingleStudent = (props) => {
     console.log('ppp', props)
+    const { tests } = props.student
+    const hasTests = tests.length ? true : false
    return ( <div>
         <h3>{props.student.fullName}</h3>
-        <h3>Average grade: {avgGrade(props.student.tests)}%</h3>
+        <h3>Average grade: { hasTests && avgGrade(props.student.tests)}%</h3>
         <div>
             <table>
                 <thead>
@@ -23,7 +25,7 @@ const SingleStudent = (props) => {
                 </thead>
                 <tbody>
                 {
-                    props.student.tests.map((test) => {
+                    hasTests && props.student.tests.map((test) => {
                         return (
                             <tr key={test.id}>
                                 <td>{test.subject}</td>
@@ -40,4 +42,4 @@ const SingleStudent = (props) => {
 }
 
 
-export default SingleStudent
\ No newline at end of file
+export default SingleStudent