NullPointerExceptions fixed