diff --git a/python/osdp_sys/cp.c b/python/osdp_sys/cp.c
index 3ff5762..78dd4d0 100644
--- a/python/osdp_sys/cp.c
+++ b/python/osdp_sys/cp.c
@@ -99,8 +99,10 @@ static PyObject *pyosdp_cp_send_command(pyosdp_cp_t *self, PyObject *args)
 	PyObject *cmd_dict;
 	struct osdp_cmd cmd;
 
-	if (!PyArg_ParseTuple(args, "IO!", &pd, &PyDict_Type, &cmd_dict))
+	if (!PyArg_ParseTuple(args, "IO!", &pd, &PyDict_Type, &cmd_dict)) {
+		PyErr_SetString(PyExc_ValueError, "Invalid arguments");
 		Py_RETURN_FALSE;
+	}
 
 	if (pd < 0 || pd >= self->num_pd) {
 		PyErr_SetString(PyExc_ValueError, "Invalid PD offset");
diff --git a/python/osdp_sys/pd.c b/python/osdp_sys/pd.c
index def9e1a..246c5d5 100644
--- a/python/osdp_sys/pd.c
+++ b/python/osdp_sys/pd.c
@@ -51,11 +51,15 @@ static PyObject *pyosdp_pd_notify_event(pyosdp_pd_t *self, PyObject *args)
 	PyObject *event_dict;
 	struct osdp_event event;
 
-	if (!PyArg_ParseTuple(args, "O", &event_dict))
+	if (!PyArg_ParseTuple(args, "O", &event_dict)) {
+		PyErr_SetString(PyExc_TypeError, "Failed to parse event dict!");
 		return NULL;
+	}
 
-	if (pyosdp_make_struct_event(&event, event_dict))
+	if (pyosdp_make_struct_event(&event, event_dict)) {
+		PyErr_SetString(PyExc_TypeError, "Unable to get event struct!");
 		return NULL;
+	}
 
 	if (osdp_pd_notify_event(self->ctx, &event)) {
 		Py_RETURN_FALSE;