diff --git a/gas/ChangeLog b/gas/ChangeLog
index f2c4dde028..62eeee36cb 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-15  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+        * config/tc-arm.c (do_neon_mov): Break on NS_NULL.
+
 2013-02-15  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
 	* configure.tgt: Add nios2-*-rtems*.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 7107bbd6e7..c7e6f344df 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -15494,6 +15494,11 @@ do_neon_mov (void)
       do_vfp_nsyn_opcode ("fmsrr");
       break;
 
+    case NS_NULL:
+      /* neon_select_shape has determined that the instruction
+	 shape is wrong and has already set the error message.  */
+      break;
+
     default:
       abort ();
     }
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 74cbc674d5..5497dd756c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-15  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+        * gas/arm/neon-vmov-bad.d: New file.
+        * gas/arm/neon-vmov-bad.s: Likewise.
+        * gas/arm/neon-vmov-bad.l: Likewise.
+
 2013-02-14  Yufeng Zhang  <yufeng.zhang@arm.com>
 
 	* gas/aarch64/system.s: Add tests.
diff --git a/gas/testsuite/gas/arm/neon-vmov-bad.d b/gas/testsuite/gas/arm/neon-vmov-bad.d
new file mode 100644
index 0000000000..47ba4d84ba
--- /dev/null
+++ b/gas/testsuite/gas/arm/neon-vmov-bad.d
@@ -0,0 +1,3 @@
+# name: Bad shape for vmov
+# as: -mfpu=neon
+# error-output: neon-vmov-bad.l
diff --git a/gas/testsuite/gas/arm/neon-vmov-bad.l b/gas/testsuite/gas/arm/neon-vmov-bad.l
new file mode 100644
index 0000000000..543dd370f4
--- /dev/null
+++ b/gas/testsuite/gas/arm/neon-vmov-bad.l
@@ -0,0 +1,2 @@
+[^:]*: Assembler messages:
+[^:]*:3: Error: invalid instruction shape -- `vmov Q0,d0'
diff --git a/gas/testsuite/gas/arm/neon-vmov-bad.s b/gas/testsuite/gas/arm/neon-vmov-bad.s
new file mode 100644
index 0000000000..ec87eeab58
--- /dev/null
+++ b/gas/testsuite/gas/arm/neon-vmov-bad.s
@@ -0,0 +1,3 @@
+.syntax unified
+.arm
+	vmov	Q0, d0