error checking and shortcode fix

Signed-off-by: Christopher Ross <cross@thisismyurl.com>