Fixed code subscription
Shortened error if statements