diff --git a/client/src/Components/SelectionView/ClassView.tsx b/client/src/Components/SelectionView/ClassView.tsx
index 228b04c2a..2bf88f062 100644
--- a/client/src/Components/SelectionView/ClassView.tsx
+++ b/client/src/Components/SelectionView/ClassView.tsx
@@ -11,7 +11,10 @@ export default function ClassView(props: ClassViewProps): JSX.Element {
     return (
         <div>
             <h1>{props.pythonClass.name}</h1>
-            <DocumentationText inputText={props.pythonClass.description}/>
+            {props.pythonClass.description ?
+                <DocumentationText inputText={props.pythonClass.description}/>
+                : <p className="pl-1rem text-muted">There is no documentation for this class.</p>
+            }
             <SectionListViewItem title={"Superclasses"} inputElements={props.pythonClass.superclasses}/>
             <SectionListViewItem title={"Decorators"} inputElements={props.pythonClass.decorators}/>
         </div>
diff --git a/client/src/Components/SelectionView/FunctionView.tsx b/client/src/Components/SelectionView/FunctionView.tsx
index 90c0bc493..cc39bd510 100644
--- a/client/src/Components/SelectionView/FunctionView.tsx
+++ b/client/src/Components/SelectionView/FunctionView.tsx
@@ -16,7 +16,10 @@ export default function FunctionView(props: FunctionViewProps): JSX.Element {
     return (
         <div>
             <h1>{props.pythonFunction.name}</h1>
-            <DocumentationText inputText={props.pythonFunction.description}/>
+            {props.pythonFunction.description ?
+                <DocumentationText inputText={props.pythonFunction.description}/>
+                : <p className="pl-1rem text-muted">There is no documentation for this function.</p>
+            }
             <h2 className={"function-title"}>Parameters</h2>
             <div className={"pl-1rem"}>
                 {