diff --git a/internal/executor/executor_test.go b/internal/executor/executor_test.go
index 7e4dc42..a486488 100644
--- a/internal/executor/executor_test.go
+++ b/internal/executor/executor_test.go
@@ -63,7 +63,7 @@ func TestExecNonExistant(t *testing.T) {
 	wg.Wait()
 
 	assert.Equal(t, int32(-1337), req.logEntry.ExitCode, "Log entry is set to an internal error code")
-	assert.Equal(t, "", req.logEntry.ActionIcon, "Log entry icon wasnt found")
+	assert.Equal(t, "💩", req.logEntry.ActionIcon, "Log entry icon is a poop (not found)")
 }
 
 func TestArgumentNameCamelCase(t *testing.T) {
diff --git a/internal/httpservers/restapi_test.go b/internal/httpservers/restapi_test.go
index 64128ec..f1d3355 100644
--- a/internal/httpservers/restapi_test.go
+++ b/internal/httpservers/restapi_test.go
@@ -100,8 +100,12 @@ func testBase(t *testing.T, expire int64, expectCode int) {
 	*/
 
 	go func() {
-		if err := srv.Serve(lis); err != nil {
-			t.Errorf("couldn't start server: %v", err)
+		if lis == nil {
+			t.Errorf("couldn't start server: listener is null")
+		} else {
+			if err := srv.Serve(lis); err != nil {
+				t.Errorf("couldn't start server: %v", err)
+			}
 		}
 	}()