diff --git a/cmd/P4wnP1_service/P4wnP1_service.go b/cmd/P4wnP1_service/P4wnP1_service.go
index f4542a1..0d0faf3 100644
--- a/cmd/P4wnP1_service/P4wnP1_service.go
+++ b/cmd/P4wnP1_service/P4wnP1_service.go
@@ -28,10 +28,7 @@ func main() {
 
 
 	//ToDo: Check for root privs
-	err = service.CheckLibComposite()
-	if err != nil {
-		log.Fatalf("Couldn't load libcomposite: %v", err)
-	}
+
 
 	//service.NewLed(false) //Set LED to manual trigger
 	//service.InitDefaultLEDSettings()
diff --git a/service/usb.go b/service/usb.go
index 89b23ab..45de55d 100644
--- a/service/usb.go
+++ b/service/usb.go
@@ -91,6 +91,8 @@ func NewUSBGadgetManager() (newUGM *UsbGadgetManager, err error) {
 	newUGM = &UsbGadgetManager{}
 	defGS := GetDefaultGadgetSettings()
 	newUGM.UndeployedGadgetSettings = &defGS //preload state with default settings
+	err = CheckLibComposite()
+	if err != nil { return nil, errors.New(fmt.Sprintf("Couldn't load libcomposite: %v", err)) }
 	err = newUGM.DeployGadgetSettings(newUGM.UndeployedGadgetSettings)
 	if err != nil { return nil, err }
 	return