diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java
--- a/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java
+++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/embedding/JsEmbeddingProvider.java
@@ -250,13 +250,16 @@
                 if (state.in_inlined_javascript || state.in_javascript) {
                     //find end of the php code
                     boolean wasInPhp = false;
-                    while (tokenSequence.moveNext() && !tokenSequence.token().id().name().equals(T_INLINE_HTML)) {
+                    boolean hasNext;
+                    while ((hasNext = tokenSequence.moveNext()) && !tokenSequence.token().id().name().equals(T_INLINE_HTML)) {
                         wasInPhp = true;
                     }
 
-                    //we are out of php code, lets move back to the previous token
-                    tokenSequence.movePrevious();
-
+                    if (hasNext) {
+                        //we are out of php code, lets move back to the previous token
+                        tokenSequence.movePrevious();
+                    }
+                    
                     if (wasInPhp) {
                         embeddings.add(snapshot.create(GENERATED_IDENTIFIER, JsTokenId.JAVASCRIPT_MIME_TYPE));
                     }