Parser Fixed

Pretty sure I fixed parser not catching invalid expression, but may need
more testing.