[#5685] Added some error checking for some corner cases
Signed-off-by: Cory Johns johnsca@geek.net
Authored by: Cory Johns 2013-02-12
Committed by: Dave Brondsema 2013-02-19
Parent(s): [3f3834]
Child(ren): [9ae902]