Properly check for required params. Close #1