diff --git a/src/Partcl/Actions.pm b/src/Partcl/Actions.pm
index 6c622c9..fa6315a 100644
--- a/src/Partcl/Actions.pm
+++ b/src/Partcl/Actions.pm
@@ -164,16 +164,24 @@ sub concat_atoms(@atoms) {
 method variable:sym<normal>($/) {
     if $<key> {
         # Array access
-        # XXX needs error handling.
         my $variable := PAST::Var.new( :scope<keyed>,
             PAST::Var.new( :name<lexpad>, :scope<register> ),
             ~$<identifier>
         );
 
-        make PAST::Var.new( :scope<keyed>,
-            $variable,
-            ~$<key>[0]
-        );
+        make PAST::Op.new( :pasttype<if>,
+            PAST::Op.new( :pirop<iseq__iss>,
+                PAST::Op.new(  :pirop<typeof__sP>, $variable),
+                PAST::Val.new( :value<TclArray>)
+            ),
+            PAST::Var.new( :scope<keyed>,
+                $variable,
+                ~$<key>[0]
+            ),
+            PAST::Op.new( :pasttype<call>, :name<error>, 
+                "can't read \"$<identifier>({$<key>[0]})\": variable isn't array"
+            )
+        )
     }
     else {
         # Scalar
diff --git a/t/tcl_var_subst.t b/t/tcl_var_subst.t
index 20f7416..f24ba88 100755
--- a/t/tcl_var_subst.t
+++ b/t/tcl_var_subst.t
@@ -37,7 +37,7 @@ eval_is {
   catch {unset a}
   set a 2
   set b $a(b)
-} {can't read "a(b)": variable isn't array} {try to use scalar as array} {TODO NQPRX}
+} {can't read "a(b)": variable isn't array} {try to use scalar as array}
 
 eval_is {
   catch {unset a}