diff --git a/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java b/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java
index e3ef65a..74afdf0 100644
--- a/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java
+++ b/app/src/main/java/com/example/cameraxtestappjava/segpass/SegpassCamera.java
@@ -688,8 +688,13 @@ public class SegpassCamera {
                 @Override
                 public void onCaptureCompleted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) {
                     super.onCaptureCompleted(session, request, result);
-                    Log.i(TAG, "onCaptureCompleted@takePicture(): sending Base64 result on callback... " + mBase64Value);
-                    mCameraCallback.onPictureTakenSuccess(mBase64Value);
+                    if (mBase64Value != null) {
+                        Log.i(TAG, "onCaptureCompleted@takePicture(): sending Base64 result on callback... " + mBase64Value);
+                        mCameraCallback.onPictureTakenSuccess(mBase64Value);
+                    } else {
+                        Log.e(TAG, "onCaptureCompleted@takePicture(): error saving picture, base64 value is null.");
+                        mCameraCallback.onPictureTakenFailError("Error saving picture...");
+                    }
                     Log.d(TAG, "Recreating camera preview...");
                     createCameraPreviewSession();
                 }