diff --git a/src/main/java/com/interplug/qcast/biz/master/MasterController.java b/src/main/java/com/interplug/qcast/biz/master/MasterController.java
index f7259c98..71cd236f 100644
--- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java
+++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java
@@ -198,9 +198,10 @@ public class MasterController {
               req.getRoofPitch());
 
       ApiTrestleDetailResponse data = response.getData();
-      data.setRoofIndex(req.getRoofIndex()); // roofIndex 추가하기 위함
+      if (data != null) {
+        data.setRoofIndex(req.getRoofIndex()); // roofIndex 추가하기 위함
+      }
       ApiResultResponse resultCode = response.getResult();
-
       ApiResponse<ApiTrestleDetailResponse> resultResponse = new ApiResponse<>();
       resultResponse.setData(data);
       resultResponse.setResult(resultCode);