Handle TP Command a bit better

See: https://spoutdev.atlassian.net/browse/SPOUT-162

Signed-off-by: Sleaker <sleaker@gmail.com>