Removed un-necessary checks for nil