diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp
index 3aee0e7b..fb48f90f 100644
--- a/source/Debugger/Debug.cpp
+++ b/source/Debugger/Debug.cpp
@@ -3685,7 +3685,7 @@ Update_t CmdDisk (int nArgs)
 			return HelpLastCommand();
 
 		Disk_Status_e eDiskState;
-		LPCTSTR       sDiskState = diskCard.GetCurrentState(&eDiskState);
+		LPCTSTR       sDiskState = diskCard.GetCurrentState(eDiskState);
 		BYTE	      nShiftReg  = diskCard.GetCurrentShiftReg();
 
 		ConsolePrintFormat(
diff --git a/source/Disk.cpp b/source/Disk.cpp
index df9bf0d3..1ed498b9 100644
--- a/source/Disk.cpp
+++ b/source/Disk.cpp
@@ -132,12 +132,11 @@ std::string Disk2InterfaceCard::GetCurrentPhaseString(void)
 	return FormatIntFracString(m_floppyDrive[m_currDrive].m_phasePrecise, true);
 }
 
-LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
+LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e& eDiskState_)
 {
 	if (m_floppyDrive[m_currDrive].m_disk.m_imagehandle == NULL)
 	{
-		if (pDiskState)
-			*pDiskState = DISK_STATUS_EMPTY;
+		eDiskState_ = DISK_STATUS_EMPTY;
 		return "Empty";
 	}
 
@@ -145,14 +144,12 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
 	{
 		if (m_floppyDrive[m_currDrive].m_spinning > 0)
 		{
-			if (pDiskState)
-				*pDiskState = DISK_STATUS_SPIN;
+			eDiskState_ = DISK_STATUS_SPIN;
 			return "Off (spinning)";
 		}
 		else
 		{
-			if (pDiskState)
-				*pDiskState = DISK_STATUS_OFF;
+			eDiskState_ = DISK_STATUS_OFF;
 			return "Off";
 		}
 	}
@@ -160,14 +157,12 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
 	{
 		if (m_floppyDrive[m_currDrive].m_disk.m_bWriteProtected)
 		{
-			if (pDiskState)
-				*pDiskState = DISK_STATUS_PROT;
+			eDiskState_ = DISK_STATUS_PROT;
 			return "Writing (write protected)";
 		}
 		else
 		{
-			if (pDiskState)
-				*pDiskState = DISK_STATUS_WRITE;
+			eDiskState_ = DISK_STATUS_WRITE;
 			return "Writing";
 		}
 	}
@@ -182,8 +177,7 @@ LPCTSTR Disk2InterfaceCard::GetCurrentState(Disk_Status_e *pDiskState)
 		}
 		else*/
 		{
-			if (pDiskState)
-				*pDiskState = DISK_STATUS_READ;
+			eDiskState_ = DISK_STATUS_READ;
 			return "Reading";
 		}
 	}
diff --git a/source/Disk.h b/source/Disk.h
index 0fa14c50..f9050d15 100644
--- a/source/Disk.h
+++ b/source/Disk.h
@@ -173,7 +173,7 @@ public:
 	static std::string FormatIntFracString(float phase, bool hex);
 	std::string GetCurrentTrackString(void);
 	std::string GetCurrentPhaseString(void);
-	LPCTSTR GetCurrentState(Disk_Status_e *pDiskState = NULL);
+	LPCTSTR GetCurrentState(Disk_Status_e& eDiskState_);
 	bool UserSelectNewDiskImage(const int drive, LPCSTR pszFilename="");
 	bool DriveSwap(void);
 	bool IsDriveConnected(int drive) { return m_floppyDrive[drive].m_isConnected; }