diff --git a/libsrc/tgi/tgi_geterror.s b/libsrc/tgi/tgi_geterror.s
index 0aa12e17c..569d6c276 100644
--- a/libsrc/tgi/tgi_geterror.s
+++ b/libsrc/tgi/tgi_geterror.s
@@ -11,11 +11,14 @@
         .export         _tgi_geterror
 
 _tgi_geterror:
+        lda     _tgi_drv                ; Check if we have a driver
+        ora     _tgi_drv+1
+        beq     @L1
         jsr     tgi_geterror            ; First call driver
-        ldx     #$00                    ; Clear high byte
+@L1:    ldx     #$00                    ; Clear high byte
         ldy     _tgi_error              ; Test high level error code
-        beq     @L1                     ; Branch if no high level error code
+        beq     @L2                     ; Branch if no high level error code
         tya                             ; Use high level code if we have one
         stx     _tgi_error              ; Clear high level error code
-@L1:    rts
+@L2:    rts