Handle no objs #3

sirsgriffin merged 2 commits into loggly:master from sirsgriffin:handle-no-objs Apr 28, 2015