diff --git a/src/rfr359f/rfr359f.cxx b/src/rfr359f/rfr359f.cxx
index f628871a..96dfc22f 100644
--- a/src/rfr359f/rfr359f.cxx
+++ b/src/rfr359f/rfr359f.cxx
@@ -23,6 +23,8 @@
  */
 
 #include <iostream>
+#include <string>
+#include <stdexcept>
 
 #include "rfr359f.h"
 
@@ -33,7 +35,8 @@ RFR359F::RFR359F(int pin)
 {
   if ( !(m_gpio = mraa_gpio_init(pin)) )
    {
-      cerr << __FUNCTION__ << ": mraa_gpio_init() failed" << endl;
+      throw std::invalid_argument(std::string(__FUNCTION__) +
+                                  ": mraa_gpio_init() failed, invalid pin?");
       return;
     }