1 files changed, 12 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 0620e0f0e..340149e0b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,9 +47,20 @@ void NonCtrlHandler(int a_Signal)
 		case SIGSEGV:
 		{
 			std::signal(SIGSEGV, SIG_DFL);
-			LOGWARN("Segmentation fault; MCServer has crashed :(");
+			LOGERROR("  D:    | MCServer has encountered an error and needs to close");
+			LOGERROR("Details | SIGSEGV: Segmentation fault");
 			exit(EXIT_FAILURE);
 		}
+		case SIGABRT:
+		#ifdef SIGABRT_COMPAT
+		case SIGABRT_COMPAT:
+		#endif
+		{
+			std::signal(a_Signal, SIG_DFL);
+			LOGERROR("  D:    | MCServer has encountered an error and needs to close");
+			LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault");
+			break;
+		}
 		case SIGTERM:
 		{
 			std::signal(SIGTERM, SIG_IGN); // Server is shutting down, wait for it...