diff --git a/libevent.lua b/libevent.lua
index 628e90e..ff2993a 100644
--- a/libevent.lua
+++ b/libevent.lua
@@ -1,9 +1,24 @@
+require("checkarg")
 local event=require("event")
 
-function AddEventListener(EventString,CallbackFunction)
-    return event.listen(EventString,CallbackFunction)
+function AddEventListener(EventName,CallbackFunction)
+    checkstring(EventName)
+    checkfunction(CallbackFunction)
+    return event.listen(EventName,CallbackFunction)
 end
 
 function RemoveEventListener(ListenerID)
+    checknumber(ListenerID)
     return event.ignore(event.handlers[ListenerID].key,event.handlers[ListenerID].callback)
+end
+
+function WaitEvent(EventName)
+    checkstring(EventName)
+    return event.pull(EventName)
+end
+
+function WaitEventFor(EventName,TimeOut)
+    checkstring(EventName)
+    checknumber(TimeOut)
+    return event.pull(TimeOut,EventName)
 end
\ No newline at end of file