Move around more null checks to prevent null pointer exceptions.  Also remove:  a suppresswarnings check that wasn't needed, logger declarations that weren't used