Reduced duplication of running code and supported extreme edge cases.

Enyo-DCO-1.1-Signed-off-by: Blake Stephens <blake.stephens@lge.com>