Merge branch 'main' into light-mode

# Conflicts:
#	ufund-ui/src/styles.css

1 files changed, 9 insertions, 1 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
index 5452c81..889abc5 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
@@ -58,7 +58,15 @@ public class CupboardController {
         String name = (String) params.get("name");
         String image = (String) params.get("image");
         String location = (String) params.get("location");
-        double maxGoal = ((Number) params.get("maxGoal")).doubleValue();
+
+        double maxGoal;
+        try {
+            maxGoal = ((Number) params.get("maxGoal")).doubleValue();
+        } catch (NullPointerException ex) {
+            LOG.log(Level.WARNING, ex.getLocalizedMessage());
+            return new ResponseEntity<>("Required fields cannot be blank", HttpStatus.BAD_REQUEST);
+        }
+
         boolean urgent = (Boolean) params.get("urgent");
         String description = (String) params.get("description");
         Need.GoalType goalType = GoalType.valueOf((String) params.get("type"));