Fixed the "Caused by: java.lang.StringIndexOutOfBoundsException: String index out of range: -1" exception.
Authored by: eagleigor 2014-02-14
Parent: [r7667]
Child: [r7669]